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

95391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
1ddf4fea57 Adhere to NavigationTreeEnableGrouping 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 14:16:04 +05:30
Madhura Jayaratne
b4150ea75c Use upper case for SQL key words 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 13:20:48 +05:30
Madhura Jayaratne
9373830149 Make SHOW DATABASES aware of only_db and hide_db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 13:11:06 +05:30
Madhura Jayaratne
92ccb972e3 Merge branch 'master' into DisableIS 2014-10-10 11:44:31 +05:30
Madhura Jayaratne
dcaf3e1ab1 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 11:43:31 +05:30
Madhura Jayaratne
dc4d694bd4 bug #4556 Fast filters for tables, views etc. should be governed by NavigationTreeDisplayItemFilterMinimum 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 11:38:19 +05:30
Madhura Jayaratne
28e2642054 Move duplicate code to a method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 11:01:55 +05:30
Madhura Jayaratne
185c45e190 Take $singleItem parameter into consideration for non IS queries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 10:25:42 +05:30
Madhura Jayaratne
b587d7cd3d Fix more failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 07:18:11 +05:30
Weblate
f9ada30dba Merge remote-tracking branch 'origin/master' 2014-10-09 16:01:28 +02:00
Michael Koch
7126860139 Translated using Weblate (German) 
Currently translated at 99.7% (2959 of 2965 strings)

[CI skip]
 2014-10-09 16:01:27 +02:00
Marc Delisle
dbf5533376 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-09 10:01:15 -04:00
Madhura Jayaratne
d441a217ec Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:56:49 +05:30
Madhura Jayaratne
719013f656 User Server reference 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:56:36 +05:30
Madhura Jayaratne
3e3e46fa27 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:56:10 +05:30
Madhura Jayaratne
adde777639 Revert "The DisableIS directive is being deprecated" 
This reverts commit b0962e8fd8.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:32:51 +05:30
Madhura Jayaratne
19432a02cc Revert "The DisableIS directive is being deprecated" 
This reverts commit 3065a3edcf.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:32:45 +05:30
Madhura Jayaratne
2c188c0109 Revert "The DisableIS directive is being deprecated" 
This reverts commit 60938c67fa.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:32:23 +05:30
Madhura Jayaratne
5cb87ecf30 Revert "The DisableIS directive is being deprecated" 
This reverts commit 4905240aed.

Conflicts:
	libraries/DatabaseInterface.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:32:17 +05:30
Madhura Jayaratne
62b15dc2f6 Revert "The DisableIS directive is being deprecated" 
This reverts commit 8fd0d79405.

Conflicts:
	libraries/navigation/Nodes/Node.class.php
	test/classes/navigation/PMA_Node_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:31:33 +05:30
Madhura Jayaratne
3f9260d3a8 Revert "The DisableIS directive is being deprecated" 
This reverts commit 89d6473f49.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:31:26 +05:30
Madhura Jayaratne
f4f910204b Revert "The DisableIS directive is being deprecated" 
This reverts commit e94f74fa51.

Conflicts:
	libraries/navigation/Nodes/Node_Database.class.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:31:20 +05:30
Madhura Jayaratne
225b463306 Revert "The DisableIS directive is being deprecated" 
This reverts commit 2ac444acd4.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:30:36 +05:30
Madhura Jayaratne
603b31d023 Revert "The DisableIS directive is being deprecated" 
This reverts commit 57ef25eed8.

Conflicts:
	test/classes/plugin/export/PMA_ExportSql_test.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:30:16 +05:30
Madhura Jayaratne
3ac46455cf Revert "The DisableIS directive is removed" 
This reverts commit d8fd82a9f5.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 18:29:55 +05:30
Madhura Jayaratne
b71e7a0599 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-09 12:29:54 +05:30
Madhura Jayaratne
f399b3f2ee Add a ChangeLog entry for bug #3165 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 12:27:42 +05:30
Weblate
bd9d791157 Merge remote-tracking branch 'origin/master' 2014-10-09 08:18:43 +02:00
Burak Yavuz
72a631235c Translated using Weblate (Turkish) 
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
 2014-10-09 08:18:41 +02:00
Michael Koch
f09c4a3281 Translated using Weblate (German) 
Currently translated at 98.4% (2919 of 2965 strings)

[CI skip]
 2014-10-09 08:18:40 +02:00
josep constanti
181c54f436 Translated using Weblate (Catalan) 
Currently translated at 82.0% (2433 of 2965 strings)

[CI skip]
 2014-10-09 08:18:38 +02:00
Madhura Jayaratne
70994d4cce Merge branch 'QA_4_2' 2014-10-09 11:47:39 +05:30
Weblate
3871584791 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-09 08:15:49 +02:00
Burak Yavuz
aebe78830e Translated using Weblate (Turkish) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-09 08:15:48 +02:00
Michael Koch
6d34ce8543 Translated using Weblate (German) 
Currently translated at 99.2% (2746 of 2768 strings)

[CI skip]
 2014-10-09 08:15:46 +02:00
josep constanti
04fb8a291b Translated using Weblate (Catalan) 
Currently translated at 86.5% (2395 of 2768 strings)

[CI skip]
 2014-10-09 08:15:45 +02:00
Madhura Jayaratne
cbcacb0f0a Merge branch 'MAINT_4_2_9' into QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:44:22 +05:30
Weblate
5f8d081411 Merge remote-tracking branch 'origin/master' 2014-10-08 14:48:24 +02:00
Michael Koch
6a658f0410 Translated using Weblate (German) 
Currently translated at 90.2% (2677 of 2965 strings)

[CI skip]
 2014-10-08 14:48:23 +02:00
Marc Delisle
3ace78d638 Merge branch 'QA_4_2' 2014-10-08 08:46:48 -04:00
Marc Delisle
1795aece1a Merge commit '21032ab' 2014-10-08 08:46:41 -04:00
Marc Delisle
d189751262 Merge commit '536d4ef' 2014-10-08 08:45:54 -04:00
Marc Delisle
de12f8359a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-08 08:45:05 -04:00
Weblate
21032ab3b1 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-08 14:42:45 +02:00
Michael Koch
dc3cabd654 Translated using Weblate (German) 
Currently translated at 95.2% (2637 of 2768 strings)

[CI skip]
 2014-10-08 14:42:44 +02:00
Marc Delisle
92efd1f7e1 Merge pull request #1374 from ashutoshdhundhara/bug_4554 
bug #4554 Grid-editing timestamp column forces datepicker.
 2014-10-08 08:42:34 -04:00
Ashutosh Dhundhara
536d4ef845 bug #4554 Grid-editing timestamp column forces datepicker. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-10-08 15:32:50 +05:30
Madhura Jayaratne
f8c1656aff Merge branch 'QA_4_2' 2014-10-07 19:36:13 +05:30
Madhura Jayaratne
01d6a06c52 Update Dummy DBI for tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:33:25 +05:30
Madhura Jayaratne
073f748e35 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:28:50 +05:30