Commit Graph

84485 Commits

Author SHA1 Message Date
Michal Čihař
b0f322eab7 Drop ShowAll dependency on MaxRows
It does not make sense since we now allow to choose up to 500 rows in
dropdown.
2013-06-24 15:32:21 +02:00
Michal Čihař
bfa700be7a Add some spacing 2013-06-24 15:32:21 +02:00
Weblate
4d897839bf Merge remote-tracking branch 'origin/master' 2013-06-24 15:13:48 +02:00
Michal Čihař
39a0b5c31b Mark JS compression for future removal 2013-06-24 15:12:04 +02:00
Weblate
84867b45f5 Merge remote-tracking branch 'origin/master' 2013-06-24 15:06:40 +02:00
Mathieu Terroba
c017c71f1f Translated using Weblate (French)
Currently translated at 99.9% (2671 of 2673)
2013-06-24 15:06:03 +02:00
Mathieu Terroba
9294d41195 Translated using Weblate (French)
Currently translated at 99.9% (2671 of 2673)
2013-06-24 15:05:44 +02:00
Michal Čihař
731e1f2d79 Drop javascript compression on release time 2013-06-24 15:04:41 +02:00
Michal Čihař
09917e0dec Include minified versions JS in git of jQuery and jQuery-UI 2013-06-24 15:03:41 +02:00
Weblate
f0a7f6e222 Merge remote-tracking branch 'origin/master' 2013-06-24 14:14:11 +02:00
Dieter Adriaenssens
6905f34eb3 Merge remote-tracking branch 'origin/QA_4_0' 2013-06-24 14:13:05 +02:00
Weblate
5e92861578 Merge remote-tracking branch 'origin/master' 2013-06-24 14:12:04 +02:00
Dieter Adriaenssens
aae0b5b679 update po files 2013-06-24 14:11:04 +02:00
Dieter Adriaenssens
43ad7caed9 update po files 2013-06-24 14:07:29 +02:00
Weblate
3f6cc59571 Merge remote-tracking branch 'origin/master' 2013-06-24 14:02:52 +02:00
Marc Delisle
ef65af3370 Merge commit 'fae5e7d' 2013-06-24 08:01:58 -04:00
Marc Delisle
4ea69f0536 Merge commit 'f0232c3' 2013-06-24 08:00:47 -04:00
Marc Delisle
fae5e7d992 Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 2013-06-24 07:58:55 -04:00
Marc Delisle
f0232c3cda bug #3985 Call to undefined function mb_detect_encoding 2013-06-24 07:58:23 -04:00
Weblate
ac5761dcd0 Merge remote-tracking branch 'origin/master' 2013-06-24 13:31:33 +02:00
Dieter Adriaenssens
4f63bb6bf1 Merge branch 'QA_4_0' 2013-06-24 13:30:11 +02:00
Dieter Adriaenssens
d0c0d0d207 fix typo 2013-06-24 13:29:36 +02:00
Weblate
474279dfe0 Merge remote-tracking branch 'origin/master' 2013-06-24 13:28:06 +02:00
Burak Yavuz
eabd2386d0 Translated using Weblate (Turkish)
Currently translated at 100.0% (2673 of 2673)
2013-06-24 13:27:26 +02:00
Dieter Adriaenssens
4b7c97a95b Merge remote-tracking branch 'origin/QA_4_0' 2013-06-24 13:26:27 +02:00
Burak Yavuz
3d35b18f34 Translated using Weblate (Turkish)
Currently translated at 100.0% (2673 of 2673)
2013-06-24 13:19:36 +02:00
Weblate
e42550d32f Merge remote-tracking branch 'origin/master' 2013-06-24 13:06:06 +02:00
Marc Delisle
2837201fff Improve English 2013-06-24 07:05:05 -04:00
Weblate
ea7e0ab62f Merge remote-tracking branch 'origin/master' 2013-06-24 12:58:08 +02:00
Marc Delisle
a5bf25a9ca Fix typo 2013-06-24 06:57:10 -04:00
Weblate
8962e5a0bf Merge remote-tracking branch 'origin/master' 2013-06-24 12:48:08 +02:00
Dieter Adriaenssens
e72765e67f Translated using Weblate (Dutch)
Currently translated at 100.0% (2673 of 2673)
2013-06-24 12:47:24 +02:00
Michal Čihař
e6b07a94d8 Merge pull request #439 from ayushchd/unit_testing
Unit tests for ctype and native string classes
2013-06-24 03:46:57 -07:00
Dieter Adriaenssens
e1f6a9274c Translated using Weblate (Dutch)
Currently translated at 100.0% (2607 of 2607)
2013-06-24 12:13:03 +02:00
Michal Čihař
abbe82a675 Update po files 2013-06-24 10:46:34 +02:00
Michal Čihař
ce1783881a Merge remote-tracking branch 'origin/QA_4_0' 2013-06-24 10:44:59 +02:00
Michal Čihař
968cec7833 Update po files 2013-06-24 10:44:06 +02:00
Michal Čihař
bebba32337 Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php
2013-06-24 10:41:54 +02:00
Weblate
e6b1a3acd4 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-06-24 10:38:19 +02:00
ayushchd
20e9b69b26 Add check for multibyte extension in PMA_StringMB_test 2013-06-24 14:23:05 +05:45
Tony Chen
3788e016ad Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2603 of 2603)
2013-06-24 10:36:55 +02:00
Michal Čihař
d6d38004c8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-24 10:36:41 +02:00
Michal Čihař
93114b2e84 Merge remote-tracking branch 'origin/QA_4_0' 2013-06-24 10:36:28 +02:00
Michal Čihař
5c0d3e8467 Merge pull request #440 from lem9/bug_3960_B
Bug #3960 NavigationBarIconic config not honored
2013-06-24 01:36:06 -07:00
Michal Čihař
ab13abccaf Merge pull request #444 from adamgsoc2013/UT_pluginss
add other test case for more coverage
2013-06-24 01:32:40 -07:00
Marc Delisle
d1a9e094ca Frames are gone 2013-06-23 19:31:30 -04:00
Marc Delisle
765c5abbe1 Fix typos 2013-06-23 19:30:11 -04:00
Marc Delisle
70dd46ecf0 Merge pull request #446 from scnakandala/gsoc_2013
Refactoring SQL executor
2013-06-23 16:27:17 -07:00
Spun Nakandala
a0a25c5745 removed unwanted code segment 2013-06-24 03:03:45 +05:30
Spun Nakandala
afcf5da9f7 wrapped lines 2013-06-24 03:00:25 +05:30