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

1010 Commits

Author SHA1 Message Date
Nisarg Jhaveri
0c704996fa Fix tests, use proxy settings from env 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-02 20:08:03 +05:30
Madhura Jayaratne
9b6561e2e3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-30 15:21:36 +05:30
Madhura Jayaratne
dadecaf393 Match the name of corresponding config value. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:16:42 +05:30
Nisarg Jhaveri
f969a76cb2 Add missing docblock in Util_test 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-30 03:00:17 +05:30
Nisarg Jhaveri
5733dd09e3 Add some unit tests 
- for Footer class
- for navigation/PMA_Node_Database class
- In Util class for foreign key check

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-30 01:29:36 +05:30
Michal Čihař
13a3fb0635 Revert "Temporarily deactivate these tests (almost always fail on ci.phpmyadmin.net)" 
This reverts commit 9403921e4e.

We should really test those. In case the requests will fail, some other
solution should be found to actually execute this code.

Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	test/classes/PMA_Config_test.php
	test/classes/PMA_Util_test.php
	test/libraries/PMA_SetupIndex_test.php
 2015-06-22 15:14:48 +02:00
Madhura Jayaratne
ab6772f4f7 Pass db name to fix the tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 16:10:50 +05:30
Madhura Jayaratne
761403517e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-18 16:05:31 +05:30
Madhura Jayaratne
ddc820c5f0 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-18 16:03:21 +05:30
Marc Delisle
c852dcb228 Merge pull request #1736 from nisargjhaveri/debug_console 
[WIP] SQL debugging in console
 2015-06-18 06:29:12 -04:00
Nisarg Jhaveri
e524023def SQL debugging in console 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-18 15:52:13 +05:30
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
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
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
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
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
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
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
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
Marc Delisle
bb8a420d8c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 13:56:39 -04:00
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
e3132374cc Merge branch 'QA_4_4' 2015-05-08 15:51:38 +05:30
Madhura Jayaratne
e60278b414 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 15:50:34 +05:30
Madhura Jayaratne
02cbe875cc Merge branch 'QA_4_4' 2015-05-08 08:20:12 +05:30
Madhura Jayaratne
34c2837894 bug #4896 Non-styled error page when following results link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 08:18:15 +05:30
Marc Delisle
bd7cd9ab9c Merge branch 'QA_4_4' 2015-05-05 10:04:37 -04:00
Marc Delisle
d3338edf87 phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-05 10:04:11 -04:00
Marc Delisle
069a2a09e7 phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-05 09:18:18 -04:00
Marc Delisle
9ff36853b9 Merge branch 'QA_4_4' 2015-05-04 10:54:05 -04:00
Marc Delisle
929a252fe1 Remove extraneous space in class 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-04 10:53:29 -04:00
Madhura Jayaratne
9ab7baadee Merge branch 'QA_4_4' 2015-05-04 10:41:40 +05:30
Madhura Jayaratne
962c56e720 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-04 10:40:48 +05:30
Marc Delisle
e4a9d114b6 Fix unit test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-01 08:02:22 -04:00
Marc Delisle
bb7a254ce4 rfe #1146 Show original size of truncated columns 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-30 09:42:24 -04:00
Marc Delisle
2f6fe5830e Rename confusing variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-29 16:00:24 -04:00
Madhura Jayaratne
d54df757f6 Fix spacing after param type 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:47:24 +05:30