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

100301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
4b9ef9db9f Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 05:39:42 +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
a36aea3d82 Cosmetic changes to the sample config file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 11:05:03 +05:30
Madhura Jayaratne
1ee8a8f944 Update sample config file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 11:00:12 +05:30
Madhura Jayaratne
96f4e7665e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-11 10:35:59 +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
Weblate
51e73e4c92 Merge remote-tracking branch 'origin/master' 2015-06-11 03:17:03 +02:00
Madhura Jayaratne
4aa933e9e3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-11 06:47:02 +05:30
Aputsiaĸ Niels Janussen
f72e5714fa Translated using Weblate (Danish) 
Currently translated at 97.4% (3027 of 3107 strings)

[CI skip]
 2015-06-11 03:17:00 +02:00
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
Marc Delisle
aed6475fb3 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-06-10 13:27:43 -04:00
Marc Delisle
e1c8b94345 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-10 13:27:39 -04:00
Madhura Jayaratne
bd911c8658 Using dataSeek should be more efficient 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 22:54:39 +05:30
Madhura Jayaratne
9081189a9a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-10 21:31:06 +05:30
Madhura Jayaratne
4c66580174 Set parameter types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 21:29:55 +05:30
Madhura Jayaratne
c88da15e88 Update doc blocks with proper types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 21:24:16 +05:30
Atul Pratap Singh
a842973fdf Merge pull request #1718 from gzzhanghao/refactor 
Refactoring tbl_indexes.lib.php & tbl_chart.lib.php
 2015-06-10 20:37:49 +05:30
Madhura Jayaratne
d32a6c2b85 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-10 20:12:27 +05:30
Madhura Jayaratne
d3d3aac92b Merge branch 'QA_4_4' 2015-06-10 20:11:25 +05:30
Madhura Jayaratne
b47e1ce456 #4953 cant drag sql.gz file onto import input 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 20:09:25 +05:30
Marc Delisle
0740c4b2b6 Clarify variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-10 08:41:48 -04:00
Jason
5bb52eec61 Fix preview sql for creating indexes 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-06-10 19:23:39 +08:00
Madhura Jayaratne
21d74afa1c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-10 09:51:20 +05:30
Madhura Jayaratne
2c5a2e47fd Move print related styles to printview.css 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 09:50:10 +05:30
Marc Delisle
0eb78a8ff2 Use strict comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-09 17:22:34 -04:00
Marc Delisle
37df4b7715 Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-09 17:08:14 -04:00
Isaac Bennetch
f215ba6e21 ChangeLog for RFE 726 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-06-09 08:32:49 -04:00
Isaac Bennetch
0a868fb4ba Merge pull request #1699 from devenbansod/rfe726 
RFE#726 - Batch changing column collations
 2015-06-09 08:31:02 -04:00
Weblate
2b19bd55ac Merge remote-tracking branch 'origin/master' 2015-06-09 13:50:25 +02:00
Børge Holm-Wennberg
a37b8fc79c Translated using Weblate (Norwegian Bokmål) 
Currently translated at 60.0% (1865 of 3107 strings)

[CI skip]
 2015-06-09 13:50:22 +02:00
Marc Delisle
9e101a407d Fix implicit conversion 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-09 07:50:01 -04:00
Madhura Jayaratne
abc9434cf2 Merge branch 'QA_4_4' 2015-06-09 15:23:28 +05:30
Madhura Jayaratne
8f92d28a45 ChangeLog entry for bug #4951 Trying to save chart as image crashes the browser 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 15:22:36 +05:30
Madhura Jayaratne
f2fd95405c #4951 Trying to save chart as image crashes the browser 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 15:21:39 +05:30
Madhura Jayaratne
2112bd3924 Bug - Fix notice on undefined variable 'col_extra' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 13:46:45 +05:30
Madhura Jayaratne
008c6ad3bf Bug empty column list in display order drop down in table search 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 12:45:13 +05:30
Madhura Jayaratne
041223c7ed Organize parameter values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 12:41:55 +05:30
Deven Bansod
30c9b2d066 RFE#726 - Batch changing column collations 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-09 12:24:34 +05:30