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

100589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
da49e8fe71 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-24 07:42:42 +05:30
Madhura Jayaratne
903000ce1b Specify types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 07:41:16 +05:30
Marc Delisle
8725217b29 Merge pull request #1757 from nisargjhaveri/navi_settings_fix 
Make text and password fields in config forms smaller
 2015-06-23 10:46:21 -04:00
Madhura Jayaratne
8bbb4af2e7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-23 20:09:01 +05:30
Madhura Jayaratne
3ff7a26426 Use 'username' instead of 'user' to be consistent with other phpMyAdmin tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 20:05:47 +05:30
dingo thirteen
ef93940e13 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3124 of 3124 strings)

[CI skip]
 2015-06-23 16:27:06 +02:00
Madhura Jayaratne
a9f1f0880e Mark real types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 19:29:27 +05:30
Madhura Jayaratne
b0e08a76ec Align docs. Use proper type 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 19:24:54 +05:30
Nisarg Jhaveri
03acf47662 Make text and password fields in config forms smaller 
The size of these field in config forms was a little too big and was
causing some problems with navigation panel settings dialig box

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-23 18:59:38 +05:30
Madhura Jayaratne
cdfc2d7ba6 A table group and table container different 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 18:42:19 +05:30
Madhura Jayaratne
02aa1fd9f5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-23 18:40:33 +05:30
Madhura Jayaratne
67a94c222c Set proper types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 18:38:54 +05:30
Marc Delisle
5713df712b Merge pull request #1756 from nisargjhaveri/config_table_fix 
Fix issue with dropdown in Settings > Navi panel > Tables
 2015-06-23 09:04:59 -04:00
Madhura Jayaratne
789d9aa018 Adjust class hierarchy to avoid accessing methods from child classes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 18:34:32 +05:30
Madhura Jayaratne
312d159922 Move database related code to Node_Database 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 18:20:28 +05:30
Nisarg Jhaveri
890bfeaf01 Fix issue with dropdown in settings > Navi panel > Tables 
dropdown for NavigationTreeDefaultTabTable2 was not behaving properly

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-23 17:51:40 +05:30
Marc Delisle
8dc5b922db Merge pull request #1752 from nisargjhaveri/nav_hide_group 
rfe#1557, Hide groups from navi panel
 2015-06-23 07:44:20 -04:00
Nisarg Jhaveri
2fa832ca89 rfe#1557 Hide groups from navi panel 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-23 17:07:02 +05:30
Marc Delisle
d946854846 Translated using Weblate (French) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-23 13:29:36 +02:00
Balázs Úr
36a1abbd9a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-23 08:32:17 +02:00
Madhura Jayaratne
a6e3855ddf Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-23 10:39:46 +05:30
Madhura Jayaratne
2e47bb08eb bug #4967 Field named '0' is not recognized 2015-06-23 10:38:12 +05:30
Isaac Bennetch
c5f8b1aa85 ChangeLog for RFE 342 and RFE 1060 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-06-22 22:54:27 -04:00
Isaac Bennetch
e19d64785b Minor style adjustment 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-06-22 22:51:42 -04:00
Madhura Jayaratne
2abda1c1d3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-23 08:18:39 +05:30
Madhura Jayaratne
81659dc2cb Match the old query, so the tests won't complain 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 08:17:20 +05:30
Isaac Bennetch
bb435183a3 Merge pull request #1737 from devenbansod/rfe1060_new 
Designer settings saved in a new table in configuration storage
 2015-06-22 22:42:52 -04:00
Madhura Jayaratne
e0750d93ae Distinguish between null and empty default values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 08:12:09 +05:30
Madhura Jayaratne
456ec1c796 Merge pull request #1755 from udan11/refactor 
Remove dead code. Following commit fd77f8d.
 2015-06-23 08:08:20 +05:30
Weblate
f2f8ee1819 Merge remote-tracking branch 'origin/master' 2015-06-23 04:23:07 +02:00
Burak Yavuz
c9989c792e Translated using Weblate (Turkish) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-23 04:23:01 +02:00
Franco
bd56018102 Translated using Weblate (Spanish) 
Currently translated at 97.9% (3060 of 3125 strings)

[CI skip]
 2015-06-23 04:22:57 +02:00
Domen
3bbf53e55a Translated using Weblate (Slovenian) 
Currently translated at 99.9% (3122 of 3125 strings)

[CI skip]
 2015-06-23 04:22:54 +02:00
Giovanni Sora
e8303d644b Translated using Weblate (Interlingua) 
Currently translated at 69.5% (2173 of 3125 strings)

[CI skip]
 2015-06-23 04:22:50 +02:00
Isaac Bennetch
9b310c3dc8 Merge pull request #1744 from devenbansod/rfe342 
Multi-file export with ZIP
 2015-06-22 22:22:45 -04:00
Dan Ungureanu
bf55d536ad Remove dead code. Following commit fd77f8d. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-06-22 23:09:18 +03:00
Burak Yavuz
3309cd0128 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-22 19:17:05 +02:00
Madhura Jayaratne
63ab039edf ChangeLog entry for bug #4963 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 20:02:44 +05:30
Madhura Jayaratne
5a1ebc2b4a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-22 19:54:50 +05:30
Madhura Jayaratne
eac19b87ad bug #4966 MySQL errors are not shown when DebugSQL is enabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 19:47:58 +05:30
Michal Čihař
52ea1026ad Remove type annotation 
It seems to be broken on some PHP versions:

Argument 1 passed to PMA_Util::configureCurl() must be an instance of
resource, resource given, called in libraries/Config.class.php on line
774 and defined

Seen this on my workstation with PHP 5.6.1 and Google shows some hits of
this as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-22 15:14:49 +02:00
Michal Čihař
67c858265d Add error checking 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-22 15:14:48 +02:00
Michal Čihař
13a3fb0635 Revert "Temporarily deactivate these tests (almost always fail on ci.phpmyadmin.net)" 
This reverts commit 9403921e4e.

We should really test those. In case the requests will fail, some other
solution should be found to actually execute this code.

Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	test/classes/PMA_Config_test.php
	test/classes/PMA_Util_test.php
	test/libraries/PMA_SetupIndex_test.php
 2015-06-22 15:14:48 +02:00
Παναγιώτης Παπάζογλου
14e630f6aa Translated using Weblate (Greek) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-22 14:51:37 +02:00
Marc Delisle
536b0a6245 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-22 08:04:40 -04:00
Marc Delisle
1685669970 Add doc to messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-22 08:02:41 -04:00
Weblate
9fc3e34321 Merge remote-tracking branch 'origin/master' 2015-06-22 13:42:08 +02:00
Zrng Abdulla
4f018d8b12 Translated using Weblate (Kurdish Sorani) 
Currently translated at 19.8% (620 of 3122 strings)

[CI skip]
 2015-06-22 13:42:04 +02:00
Marc Delisle
7edd9524c0 Merge pull request #1751 from madhuracj/bug4963 
#4963 Improve/restore non-unique index row editing
 2015-06-22 07:42:02 -04:00
Atul Pratap Singh
7d8faa6818 Merge pull request #1748 from Tithugues/templating_master 
Templating getStartAndNumberOfRowsPanel function, recursivity and failures
 2015-06-22 13:54:46 +05:30