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

2407 Commits

Author SHA1 Message Date
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
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
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
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
Marc Delisle
a6da0dda0e Merge branch 'QA_4_4' 2015-05-06 10:15:50 -04:00
Marc Delisle
8a5824968a phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-06 10:15:11 -04:00
Madhura Jayaratne
989cd902b3 Start with caps 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 10:34:21 +05:30
Madhura Jayaratne
072e0ce458 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 10:09:26 +05:30
Madhura Jayaratne
36b863afd0 Fix some style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-06 09:55:27 +05:30
Marc Delisle
468346df20 Merge branch 'QA_4_4' 2015-05-05 14:33:03 -04:00
Marc Delisle
65277b2ebb phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-05 14:32:29 -04:00
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
Madhura Jayaratne
9f103f3610 Improve icon consistency 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-01 15:15:20 +05:30
Madhura Jayaratne
545de160ab Apply length limits 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-01 07:31:36 +05:30
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