Commit Graph

73184 Commits

Author SHA1 Message Date
mratajsky
8ae5c3423e Fix chart name getting constantly forgotten as it's not saved for chart redraws 2012-04-07 19:11:06 +03:00
Jo Michael
8747608736 Merge pull request #19 from Gemorroj/master
Better compatibility with newer versions of jQuery (attr -> prop, attr("value") -> val()), more JS code enhancements
2012-04-07 07:32:09 -07:00
Gemorroj
3ca134c183 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2012-04-07 17:10:48 +03:00
Gemorroj
c3747a56e5 some code standards fixes 2012-04-07 17:10:32 +03:00
Jo Michael
69ce80b4f8 Clean up opening import <form> tag 2012-04-07 15:43:36 +02:00
Marc Delisle
1fd405d20e Update to jQuery 1.7.2 2012-04-07 09:29:47 -04:00
Gemorroj
59874a6ab9 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2012-04-07 14:35:02 +03:00
Gemorroj
8bdca339f6 Better compatibility with newer versions of jQuery.
Method of "attr" changed to "prop", method of "removeAttr" changed to "removeProp", attr("value" is replaced by the method of "val".
2012-04-07 14:27:28 +03:00
Marc Delisle
6c9fe31609 Merge branch 'QA_3_5' 2012-04-07 07:15:09 -04:00
Marc Delisle
d455dfabfc 3.5.0 release 2012-04-07 07:14:29 -04:00
Marc Delisle
cb220630dd Merge branch 'QA_3_5' 2012-04-07 07:02:07 -04:00
Marc Delisle
d663114700 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-07 07:01:35 -04:00
Michal Čihař
7cd866ce7f Merge remote-tracking branch 'origin/master' 2012-04-07 12:42:17 +02:00
Madhura Jayaratne
e8dc6f846b Merge branch 'QA_3_5'
Conflicts:
	sql.php
2012-04-07 16:10:59 +05:30
Madhura Jayaratne
e10ece8214 bug #3515666 [display] Profiling chart shows wrong data 2012-04-07 16:00:20 +05:30
Burak Yavuz
4aafbcab2c Translated using Weblate. 2012-04-07 05:01:13 +02:00
Madhura Jayaratne
a0c17528d9 Translated using Weblate. 2012-04-07 05:01:12 +02:00
Holger Ronecker
e4e37ba12d Translated using Weblate. 2012-04-07 05:01:11 +02:00
Michal Čihař
dc5959a845 Merge remote-tracking branch 'origin/master' 2012-04-07 00:24:17 +02:00
Domen
1a6a630822 Translated using Weblate. 2012-04-07 00:24:14 +02:00
Jo Michael
54e34e5ef2 Fixed PHP 5.4 session.upload_progress import library with a workaround 2012-04-07 00:23:53 +02:00
Domen
e39a0a9d82 Translated using Weblate. 2012-04-06 21:02:53 +02:00
Michal Čihař
9ff651d881 Merge remote-tracking branch 'origin/master' 2012-04-06 19:23:03 +02:00
Jo Michael
20b5b9bd28 Added: Restore tbl_change.php after_insert dropdown status after first submit. 2012-04-06 19:22:48 +02:00
Michal Čihař
f27a03bc14 Merge remote-tracking branch 'origin/master' 2012-04-06 18:12:58 +02:00
Burak Yavuz
84e1850189 Translated using Weblate. 2012-04-06 18:12:56 +02:00
Madhura Jayaratne
a8878e46fc Translated using Weblate. 2012-04-06 18:12:56 +02:00
Dieter Adriaenssens
091daa3944 clarify code 2012-04-06 18:08:43 +02:00
Dieter Adriaenssens
76ce88555c improve coding style 2012-04-06 18:01:57 +02:00
Dieter Adriaenssens
193ea6e5bf improve coding style 2012-04-06 17:46:16 +02:00
Dieter Adriaenssens
bc97f0665d wrap long lines 2012-04-06 17:44:49 +02:00
Holger Ronecker
6d25b67efd Translated using Weblate. 2012-04-06 17:14:32 +02:00
Burak Yavuz
cece2f1777 Translated using Weblate. 2012-04-06 17:00:35 +02:00
Holger Ronecker
9c7bd50cb1 Translated using Weblate. 2012-04-06 16:48:30 +02:00
Dieter Adriaenssens
b979097f5f fix typo, improve coding style 2012-04-06 16:28:44 +02:00
Michal Čihař
7e4a8dd1a0 Merge remote-tracking branch 'origin/master' 2012-04-06 16:06:42 +02:00
Madhura Jayaratne
a6e0fee327 Translated using Weblate. 2012-04-06 16:06:39 +02:00
Holger Ronecker
cb5b629cd6 Translated using Weblate. 2012-04-06 16:06:38 +02:00
Dieter Adriaenssens
d844827af8 use include with conditional includes 2012-04-06 16:06:20 +02:00
Michal Čihař
a5d5305146 Merge remote-tracking branch 'origin/QA_3_5' 2012-04-06 14:47:25 +02:00
Michal Čihař
09f2cab144 Merge branch 'MAINT_3_5_0' into QA_3_5 2012-04-06 14:44:18 +02:00
Michal Čihař
a8df11f73d Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 2012-04-06 14:44:11 +02:00
Holger Ronecker
30eae2002e Translated using Weblate. 2012-04-06 14:42:50 +02:00
Holger Ronecker
c7d2f8e33b Translated using Weblate. 2012-04-06 14:42:32 +02:00
Holger Ronecker
7f69d444a1 Translated using Weblate. 2012-04-06 14:42:20 +02:00
Michal Čihař
dba2c775a1 Merge remote-tracking branch 'origin/master' 2012-04-06 13:08:08 +02:00
Holger Ronecker
acc576f8fc Translated using Weblate. 2012-04-06 13:08:00 +02:00
Michal Čihař
337f39e060 Update po files 2012-04-06 13:07:23 +02:00
Michal Čihař
9e95a48c22 Rename script to reflect reality 2012-04-06 13:06:14 +02:00
Michal Čihař
0c0b98f1bf Make line numbers 1-based 2012-04-06 13:05:42 +02:00