Commit Graph

1034 Commits

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
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
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
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
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
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
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
00449976ff Make PHPcs happy.
Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-05-23 00:43:18 +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
Nisarg Jhaveri
e115adb533 Page-related settings, rfe#1559
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
2015-05-18 20:38:07 +05:30
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
Madhura Jayaratne
3addba490c Do not break the urls in the middle. Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-14 08:09:43 +05:30
Madhura Jayaratne
0fc60cc05e Temporarily remove failing assertion
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-13 13:40:24 +05:30
Deven Bansod
d00fe5cf6a RFE #1485 : Add a DROP/ COALESCE Partition option in Partition Maintenance
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-05-11 06:00:20 +05:30
Marc Delisle
4d02033f47 Merge branch 'QA_4_4' 2015-05-08 14:50:05 -04:00
Marc Delisle
b3a18956cf Fix failing test
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-08 14:49:41 -04:00
Marc Delisle
7fd24d1644 Merge branch 'QA_4_4' 2015-05-08 13:47:10 -04:00
Marc Delisle
4db6481ea3 Fix failing test
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-08 13:46:43 -04:00
Madhura Jayaratne
16fc314235 Fix more indentations
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-08 21:17:42 +05:30
Madhura Jayaratne
b4b1f5edda Fix bad indentation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-08 21:14:18 +05:30
Madhura Jayaratne
096535fa8a Remove trailing white spaces
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-08 21:09:41 +05:30
Marc Delisle
6dd341f5c5 phpunit 4.2: assertTag is deprecated
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-07 10:24:06 -04:00
Marc Delisle
5d9a7a748c Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-07 10:18:08 -04:00
Marc Delisle
504b80adbf phpunit 4.2: assertTag is deprecated
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-07 10:16:20 -04:00
Marc Delisle
a5398611f7 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-07 08:47:46 -04:00
Marc Delisle
9306a93bec phpunit 4.2: assertTag is deprecated
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-07 08:45:43 -04:00
Marc Delisle
96500249da Merge branch 'QA_4_4' 2015-05-06 15:16:18 -04:00
Marc Delisle
3e5eb604c6 phpunit 4.2: assertTag is deprecated
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-06 15:15:23 -04:00
Marc Delisle
10fcc393fb Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-06 13:28:49 -04:00
Marc Delisle
6dfd1c135c phpunit 4.2: assertTag is deprecated
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-05-06 13:24:50 -04:00