gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,241 Commits 12 Branches 481 Tags 2.4 GiB
dcec810564
Commit Graph

73241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jo Michael
dcec810564 Merge branch 'QA_3_5' 2012-04-09 16:36:06 +02:00
Jo Michael
01b6b8f613 - bug #3516037 [auth] JS includes missing in auth config error page 2012-04-09 16:25:26 +02:00
Marc Delisle
dd5aae9a67 jQuery UI is already included from common.inc.php 2012-04-09 09:09:07 -04:00
Marc Delisle
f2c88c3afc Refresh .po files 2012-04-09 08:45:22 -04:00
Marc Delisle
c1347364b8 PHP 5.4 compatibility for scripts/update-po 2012-04-09 08:44:23 -04:00
Marc Delisle
50587ef616 Merge pull request #22 from Gemorroj/master 
minor fixes in export, corrected title and chart with special html characters
 2012-04-09 05:23:29 -07:00
Marc Delisle
a3edbfc1b1 Add parameter to strDoYouReally message for better translatability 
Include jquery.sprintf.js everywhere
 2012-04-09 08:20:45 -04:00
Gemorroj
d8d25826a0 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 
Conflicts:
	js/export.js
 2012-04-09 15:07:20 +03:00
Jo Michael
3f545e316a Fix DoYouReally confirm dialogs 2012-04-09 00:19:33 +02:00
Jo Michael
104ec11200 No additional spaces in "(query took ...)" message 2012-04-08 23:03:58 +02:00
Jo Michael
4521b28517 Use pma-bbcode for trigger_error messages 2012-04-08 21:09:31 +02:00
Jo Michael
ea65b806ab Fix show_config_errors.php 2012-04-08 21:08:47 +02:00
Jo Michael
1e0894994b - bug #3507917 [export] JSON has unescaped values for allegedly numeric columns 2012-04-08 19:36:06 +02:00
Jo Michael
3f13a99c3c Fix typo in '...is lower that cookie validity...' 2012-04-08 19:13:33 +02:00
Jo Michael
50bbe39d30 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-08 19:01:18 +02:00
Jo Michael
b620322350 Fix theme test page 2012-04-08 19:00:40 +02:00
Marc Delisle
1a5adbb7e2 Table type is an older term for storage engine 2012-04-08 10:56:06 -04:00
Jo Michael
7aa3086512 Show "copy column name" hint only if mouse not hovering sort link 2012-04-08 16:46:30 +02:00
Jo Michael
4cfd1cf149 Replace removeProp("checked") with prop("checked", false), calling removeProp("checked") is irreversible in Chrome 2012-04-08 16:45:46 +02:00
Madhura Jayaratne
31021aa767 Translated using Weblate. 2012-04-08 16:29:13 +02:00
Madhura Jayaratne
41bcc89864 Translated using Weblate. 2012-04-08 16:20:42 +02:00
Gemorroj
ad03783a2f A more correct variable name. 2012-04-08 15:34:26 +03:00
Michal Čihař
6e695e60dd Merge remote-tracking branch 'origin/master' 2012-04-08 13:44:29 +02:00
Domen
13b0adee69 Translated using Weblate. 2012-04-08 13:44:26 +02:00
Madhura Jayaratne
aad2b35ed8 Translated using Weblate. 2012-04-08 13:44:26 +02:00
Asle Ommundsen
17b56faa9b Translated using Weblate. 2012-04-08 13:44:25 +02:00
Yuichiro Takahashi
4e19d71bd3 Translated using Weblate. 2012-04-08 13:44:25 +02:00
LiivaneLord
42bf907001 Translated using Weblate. 2012-04-08 13:44:24 +02:00
Marc Delisle
3aab0b4274 Merge pull request #21 from mratajsky/master 
Fix chart name getting lost
 2012-04-08 04:44:20 -07:00
Gemorroj
6e8bc0dd74 Fixed title with table name is "test<>'"&test&&]]>", fixed chart with column name and data is "test<>'"&test&&]]>", some improvements. 2012-04-08 10:41:24 +03:00
Gemorroj
60eccbdce1 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2012-04-08 08:50:01 +03:00
Gemorroj
ca76d5c21a Revert "compress png images" 
This reverts commit 447ab447e8.
 2012-04-08 08:41:03 +03:00
LiivaneLord
39756f4d4a Translated using Weblate. 2012-04-07 20:52:50 +02:00
Michal Čihař
8ccccfab5b Merge remote-tracking branch 'origin/master' 2012-04-07 20:49:33 +02:00
Domen
4cd2a80385 Translated using Weblate. 2012-04-07 20:49:31 +02:00
LiivaneLord
89223c5947 Translated using Weblate. 2012-04-07 20:49:29 +02:00
Jo Michael
45e2dc322e Fixed import format not auto-selected on file pick 2012-04-07 20:49:12 +02:00
Jo Michael
6ba62e1b2d Replaced "seperator" with "separator" 2012-04-07 20:23:22 +02:00
Jo Michael
952ca9efca Show file upload speed for imports 2012-04-07 20:17:49 +02:00
LiivaneLord
f1e3ea3b5b Translated using Weblate. 2012-04-07 20:15:24 +02:00
LiivaneLord
b4318e578c Translated using Weblate. 2012-04-07 20:12:02 +02:00
Michal Čihař
3c2b5aa149 Merge remote-tracking branch 'origin/master' 2012-04-07 19:56:15 +02:00
Madhura Jayaratne
b3076f0ecd Translated using Weblate. 2012-04-07 19:56:08 +02:00
Asle Ommundsen
233c62e38f Translated using Weblate. 2012-04-07 19:56:07 +02:00
Jo Michael
263d0137fd Show progress bar with timing for import uploads 2012-04-07 19:55:45 +02:00
Gemorroj
447ab447e8 compress png images 2012-04-07 20:06:16 +03:00
mratajsky
8ae5c3423e Fix chart name getting constantly forgotten as it's not saved for chart redraws 2012-04-07 19:11:06 +03:00
Gemorroj
2c618b102f some fixes and code optimizations in export 2012-04-07 18:45:02 +03:00
Jo Michael
d7f303fea3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-04-07 16:36:12 +02:00
Michal Čihař
7fae3c12be Merge remote-tracking branch 'origin/master' 2012-04-07 16:32:21 +02:00