Commit Graph

73206 Commits

Author SHA1 Message Date
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
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
Asle Ommundsen
85237d8244 Translated using Weblate. 2012-04-07 16:32:18 +02: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
321b8cc880 Added width and height attributes to ajax throbber img. 2012-04-07 16:02:47 +02:00
Jo Michael
5495ef8ddc Added PHP 5.4+ session.upload_progress to documentation 2012-04-07 15:59:59 +02:00
Michal Čihař
262eb977f3 Merge remote-tracking branch 'origin/master' 2012-04-07 15:44:00 +02:00
Asle Ommundsen
39e6d65dff Translated using Weblate. 2012-04-07 15:43:58 +02:00
Jo Michael
69ce80b4f8 Clean up opening import <form> tag 2012-04-07 15:43:36 +02:00
Michal Čihař
131d11dfe6 Merge remote-tracking branch 'origin/master' 2012-04-07 15:31:28 +02:00
Victor Volkov
53c849a276 Translated using Weblate. 2012-04-07 15:31:25 +02:00
Marc Delisle
1fd405d20e Update to jQuery 1.7.2 2012-04-07 09:29:47 -04:00
Victor Volkov
5c144a021e Translated using Weblate. 2012-04-07 15:11:00 +02: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