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

2448 Commits

Author SHA1 Message Date
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
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
Madhura Jayaratne
4b9ef9db9f Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 05:39:42 +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
6dc1b0e311 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-08 20:14:57 +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
00e27a6a7f Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-07 06:53:33 -04:00
Marc Delisle
eac498415a Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-06 05:28:34 -04:00
Madhura Jayaratne
2a3fc5f4e1 Adjust tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-05 21:25:41 +05:30
Atul Pratap Singh
d203426053 Comment out an assert, to be fixed after some time 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-06-04 23:00:30 +05:30
Madhura Jayaratne
cacf74c9b9 Remove superfluous whitespace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-04 14:34:50 +05:30
Isaac Bennetch
af658d27ee Merge pull request #1708 from devenbansod/rfe701_using_css 
RFE#701 - Print View using CSS - Rewrite
 2015-06-01 14:50:04 -04:00
Deven Bansod
aeae86d7cc RFE#701 - Print View using CSS - Rewrite 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-01 03:57:50 +05:30
Isaac Bennetch
7634905762 Feature request 1675: MySQL and MariaDB functions INET6_ATON and INET6_NTOA 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-05-31 09:48:20 -04:00
Atul Pratap Singh
7abd44ece3 Merge pull request #1700 from gzzhanghao/template 
Complete templates for table related scripts
 2015-05-31 13:36:25 +05:30
Jason
79319a60fc Templates for table related scripts 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-31 03:23:26 +08:00
Marc Delisle
73d82392a0 Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-30 07:14:58 -04:00
Marc Delisle
f0c272ce6e Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-29 07:26:49 -04:00
Madhura Jayaratne
375d34157b Merge branch 'QA_4_4' 2015-05-29 15:46:39 +05:30
Madhura Jayaratne
6a6ed5d5dc Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-29 15:45:27 +05:30
Marc Delisle
ffdd12dd01 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-28 09:55:57 -04:00
Madhura Jayaratne
8b4faf6df1 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-28 15:07:51 +05:30
Madhura Jayaratne
7381aa554e Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-28 15:03:08 +05:30
Marc Delisle
9150ec77f5 Remove unused parameter doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-27 13:53:24 -04:00
Marc Delisle
3c29b82add Deactivate currently unused parameters in test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-27 10:30:10 -04:00
Madhura Jayaratne
7cf49a14b6 Wrap a long line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-27 17:50:25 +05:30
Madhura Jayaratne
42382a6819 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-27 17:44:10 +05:30
Madhura Jayaratne
cec7440341 Add a sane value for testing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-27 12:24:37 +05:30
Madhura Jayaratne
71d8bc45de remove unused values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-25 15:05:55 +05:30
Madhura Jayaratne
5e92c1b7bc Update more tests. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-25 14:59:53 +05:30
Madhura Jayaratne
8447db08d7 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-25 14:58:34 +05:30
Hugues Peccatte
e1d0646fed Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-23 01:21:30 +02:00
Hugues Peccatte
00449976ff Make PHPcs happy. 
Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-23 00:43:18 +02:00
Hugues Peccatte
f007f40fc9 Make PHPcs happy. 
Add PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-23 00:38:06 +02:00
Hugues Peccatte
f4ac3e3ba8 Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-23 00:16:25 +02:00
Marc Delisle
2d6cfdd700 Merge pull request #1685 from nisargjhaveri/navi_settings 
Navigation panel settings
 2015-05-22 07:57:28 -04:00
Nisarg Jhaveri
9c77ec694e Navigation panel settings 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-22 17:15:03 +05:30
Marc Delisle
3f8501fcbb Fix type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-21 15:41:44 -04:00
Jason
c6dfa49e60 Improve template system 
- Introduce `trim` method for templates
- Complete template of the designer module
- Update tests for template system
- Use phtml as template files extension

Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-20 01:34:33 +08:00
Nisarg Jhaveri
e115adb533 Page-related settings, rfe#1559 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-18 20:38:07 +05:30
Marc Delisle
bb8a420d8c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 13:56:39 -04:00
Madhura Jayaratne
a66261bbd7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-15 10:32:25 +05:30
Madhura Jayaratne
cc9bd408bc Fix test failures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 10:31:25 +05:30
Atul Pratap Singh
2cc67d10b1 Merge pull request #1642 from gzzhanghao/oop-refactor 
Refactoring tbl_view.lib and add PMA\Template
 2015-05-15 10:22:36 +05:30
Jason
ce3c8b0c66 Refactoring tbl_view.lib and add PMA\Template 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-15 03:48:25 +08:00
Nisarg Jhaveri
431847b39e Return HTML instead of echo-ing directly in FormDisplay 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-15 00:56:26 +05:30
Madhura Jayaratne
903509a168 Merge branch 'QA_4_4' 2015-05-14 08:31:10 +05:30