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

100614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
8a567b7b66 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-25 11:44:30 +05:30
Madhura Jayaratne
15a3686fd3 Better text for the submit button 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-25 11:42:50 +05:30
Marc Delisle
3da1dbac99 Merge pull request #1760 from udan11/fix_syntax 
Syntax error and refactoring.
 2015-06-24 17:37:53 -04:00
Stefano Martinelli
777bca0983 Translated using Weblate (Italian) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-24 22:37:39 +02:00
Dan Ungureanu
3b56d90297 Syntax error and refactoring. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-06-24 19:45:49 +03:00
Isaac Bennetch
0211920790 Merge pull request #1759 from devenbansod/1060C 
Changed the mysql reserved words conflicting column names in Designer settings
 2015-06-24 10:02:20 -04:00
Deven Bansod
3d1157c944 Changed the mysql reserved words conflicting column names 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-25 00:14:06 +05:30
Madhura Jayaratne
dd7230cc20 Fix tests for PMA_getDefaultPage and new tests for PMA_getLoadingPage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 18:13:33 +05:30
Madhura Jayaratne
ee7564af01 Load in visual query builder the default pdf page if such exists 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 18:01:55 +05:30
Madhura Jayaratne
57a84214da Add missing backquotes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 17:29:19 +05:30
Madhura Jayaratne
d4af9bc634 Fix syntax error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 17:13:03 +05:30
Madhura Jayaratne
7450a2093f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-24 17:05:25 +05:30
Madhura Jayaratne
77a0b44fc3 Merge branch 'QA_4_4' 
Conflicts:
	libraries/db_designer.lib.php
 2015-06-24 17:04:12 +05:30
Madhura Jayaratne
a0beb6da88 bug Missing selected/entered values when editing active options in visual query builder 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 17:00:01 +05:30
Marc Delisle
5784566a23 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-24 07:15:37 -04:00
Madhura Jayaratne
be31498242 Bug - show build query dialog in full screen view also 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 16:00:59 +05:30
Madhura Jayaratne
6f1e69afc5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-24 13:42:30 +05:30
Madhura Jayaratne
09957ec344 Fix undefined index 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 13:41:15 +05:30
Weblate
2777af8813 Merge remote-tracking branch 'origin/master' 2015-06-24 10:05:16 +02:00
Hauke Henningsen
56b11ce13f Translated using Weblate (German) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-24 10:05:13 +02:00
Madhura Jayaratne
86f43b063b New tests for insert/edit form changes based on column privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 13:34:53 +05:30
Madhura Jayaratne
3931d16bca Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 12:08:57 +05:30
Madhura Jayaratne
b9169b02cb Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 12:04:34 +05:30
Madhura Jayaratne
926e310a59 Workaround for column privileges for Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 11:58:17 +05:30
Madhura Jayaratne
ff1592483a rfe #689 Column privileges and update 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-24 11:51:29 +05:30
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