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

100273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Madhura Jayaratne
176e642bc4 Merge branch 'QA_4_4' 2015-06-09 11:00:04 +05:30
Madhura Jayaratne
e1f043c90f Fix ChangeLog 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 10:57:59 +05:30
Madhura Jayaratne
88696e7807 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-09 10:56:00 +05:30
Madhura Jayaratne
31d29835e9 Add select all to database selector in replication gui 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 10:53:55 +05:30
Weblate
d5927a0ac1 Merge remote-tracking branch 'origin/master' 2015-06-09 07:16:57 +02:00
Madhura Jayaratne
619f327515 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-09 10:46:55 +05:30
Balázs Úr
34a38ac937 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
 2015-06-09 07:16:53 +02:00
Madhura Jayaratne
c468076031 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 10:46:29 +05:30
Madhura Jayaratne
5cf2703856 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-06-09 10:44:55 +05:30
Madhura Jayaratne
7902535a12 bug #4950 Issues in database selection for replication 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 10:43:46 +05:30
Isaac Bennetch
5d35950556 Merge pull request #1717 from devenbansod/701C 
Removed an unnecessary cell in printview of query results
 2015-06-08 16:00:30 -04:00
Kurt Eilertsen
5b0ce01a52 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 61.6% (1870 of 3035 strings)

[CI skip]
 2015-06-08 21:44:34 +02:00
Marc Delisle
8f8932c446 Fix implicit conversion 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-08 12:23:13 -04:00
Madhura Jayaratne
6dc1b0e311 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 20:14:57 +05:30
Madhura Jayaratne
564135c99a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-08 20:13:07 +05:30
Madhura Jayaratne
775ff68df3 Align labels in table operations page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 20:11:33 +05:30
Jason
4ecdba9100 Refactoring tbl_indexes.lib.php & tbl_chart.lib.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-06-08 21:54:27 +08:00
Marc Delisle
3169c5f48d Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-08 08:40:11 -04:00
Madhura Jayaratne
0febc016ee Move adjust privileges next to rename since its applicable there and no to other table options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 17:43:46 +05:30
Madhura Jayaratne
8834e55b19 Separate create options from post create actions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 17:37:13 +05:30
Madhura Jayaratne
5bc88eed28 Show indexes in print view in table structure page when InitialSlidersState is 'disabled' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 15:50:45 +05:30
Madhura Jayaratne
42f2e29f14 bug - Attribute column in table structure does not have borders 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 15:44:47 +05:30
Madhura Jayaratne
7f3fa4c857 #4947 Editing a view gives errors - Included file no longer exists and its methods has been moved else where 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 14:40:17 +05:30
Madhura Jayaratne
c65a989724 Separate creation activities from post create activities 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 14:13:16 +05:30
Madhura Jayaratne
462c874370 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-08 13:37:29 +05:30
Madhura Jayaratne
380cd38ed1 bug #4946 When hide table structure actions is false, action should be in a row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 13:34:02 +05:30
Deven Bansod
ee6cd74ea3 Removed an unnecessary cell in printview. 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-08 03:59:31 +05:30
Marc Delisle
00e27a6a7f Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-07 06:53:33 -04:00