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

13999 Commits

Author SHA1 Message Date
Madhura Jayaratne
714ab04d51 bug #4795 Query builder: missing joint for the intermediary table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 11:47:22 +05:30
Madhura Jayaratne
f965893c7b Refactor: Move table JOINing logic to a separate method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 10:53:39 +05:30
Madhura Jayaratne
fae84aca9a Refactor: move to a new method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 10:45:19 +05:30
Madhura Jayaratne
7a4efae405 Better variable names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 10:32:15 +05:30
Madhura Jayaratne
2d331942f5 Reduce duplication 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 10:10:07 +05:30
Madhura Jayaratne
7c12bb64a3 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 08:51:28 +05:30
Madhura Jayaratne
ed357d7716 bug External URL for $cfg['NavigationLogoLink'] causes JavaScript error when clicked 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 08:48:14 +05:30
Madhura Jayaratne
4076c6b15f Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 19:44:02 +05:30
Madhura Jayaratne
37a40028e3 bug #4955 Clicking on the navi logo does not always work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 19:39:06 +05:30
Marc Delisle
cebb2a5140 Merge pull request #1734 from sibprogrammer/feature-control-min-version 
Ability to contol the minimal MySQL version via config.
 2015-06-15 15:20:17 -04:00
Marc Delisle
9acf48878d The "GENERAL" word was a keyword only between MySQL 5.5.3 and 5.5.8 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-15 11:11:03 -04:00
Atul Pratap Singh
ec43664014 Merge pull request #1733 from Tithugues/templateForLogo_master 
Manage logo display in navigation panel, with a template.
 2015-06-15 16:41:31 +05:30
Marc Delisle
175fb2f4b7 Match returned value with documented type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-15 06:49:01 -04:00
Alexei Yuzhakov
d384a6b432 Ability to contol the minimal MySQL version via config. 
Signed-off-by: Alexei Yuzhakov <sibprogrammer@gmail.com>
 2015-06-15 08:05:17 +06:00
Hugues Peccatte
1a0005418b Manage logo display in navigation panel, with a template. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-15 00:41:27 +02:00
Alexei Yuzhakov
645cf9f978 Prohibit the ability to check version if it was disabled. 
Signed-off-by: Alexei Yuzhakov <sibprogrammer@gmail.com>
 2015-06-14 20:46:11 +06:00
Hugues Peccatte
75fb3e6c17 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 13:39:59 +02:00
Hugues Peccatte
9867e4459b Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 13:36:16 +02:00
Hugues Peccatte
8d443b08a5 Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 13:22:52 +02:00
Madhura Jayaratne
734d0684e5 Merge pull request #1723 from madhuracj/qbe 
QBE improvements including bug fixes
 2015-06-14 07:46:57 +05:30
Hugues Peccatte
3f8dab6d33 Make PHPcs happy. 
Add missing PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 00:49:19 +02:00
Deven Bansod
0709cb606b Corrected small error in PR#1720 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-14 01:56:19 +05:30
Madhura Jayaratne
40a19030ec Merge branch 'master' into qbe 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-13 07:46:33 +05:30
Hugues Peccatte
3827e3e988 Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-12 22:24:32 +02:00
Isaac Bennetch
cad0eda2c7 Merge pull request #1720 from devenbansod/rfe1594 
RFE#1594: Use plain English descriptors instead of script names for Browse, SQL, Privileges, etc links
 2015-06-12 15:13:34 -04:00
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-13 04:41:54 +05:30
Nisarg Jhaveri
4ca5064aeb Fix tests 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 19:40:23 +05:30
Nisarg Jhaveri
620600f3b9 Foreign key check checkbox for empty/drop in db_structure 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 19:40:23 +05:30
Madhura Jayaratne
393aa8e694 Add master table only if it's not empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 18:31:02 +05:30
Madhura Jayaratne
8dacdd198e Move the column count obtaining logic to a separate method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 18:24:47 +05:30
Madhura Jayaratne
d42e05b9f8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-12 17:35:57 +05:30
Madhura Jayaratne
a759ac0185 Bug #4954 Warnings on query results refresh 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 17:33:42 +05:30
Marc Delisle
c289df12cd Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-12 07:35:34 -04:00
Marc Delisle
66a8288c77 Merge pull request #1724 from nisargjhaveri/issue_4948 
Fix bug#4948
 2015-06-12 07:26:54 -04:00
Nisarg Jhaveri
d1bb026034 Fix bug#4948 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 12:18:25 +05:30
Madhura Jayaratne
ab9a8bdd25 Do array multi sort only when sort order is defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 11:58:50 +05:30
Madhura Jayaratne
401dbb1918 Allow ordering order by clauses 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 10:36:16 +05:30
Madhura Jayaratne
ab6b617e97 Introduce aliases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 07:27:51 +05:30
Madhura Jayaratne
2a0397dd33 Remove the choice to select whether or not to use joins. Reverts 27c259c and 357f0be 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 06:23:51 +05:30
Madhura Jayaratne
115607abb2 bug #4510 QBE generates wrong query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 21:27:06 +05:30
Madhura Jayaratne
357f0be265 Use negation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 14:00:04 +05:30
Madhura Jayaratne
ce304b3157 Remove database name for consistency 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 13:53:02 +05:30
Madhura Jayaratne
7e69d0ff54 And and Or checkboxes in last column is redundant 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 13:29:57 +05:30
Madhura Jayaratne
bdf51f23cd Interchange show and sort rows 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 13:05:23 +05:30
Madhura Jayaratne
27c259c7cb Allow user to chose whether to use joins or not 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 12:58:11 +05:30
Madhura Jayaratne
036d70aa8d All tables are not defined outside 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 12:45:57 +05:30
Madhura Jayaratne
29535aa55a Fix variable comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 10:22:24 +05:30
Madhura Jayaratne
4aa933e9e3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-11 06:47:02 +05:30
Madhura Jayaratne
57d68d53d5 Initialize the positions to 0 when empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 06:45:53 +05:30
Marc Delisle
a069ab24ee Optimize 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-10 13:31:47 -04:00