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

980 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
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
Madhura Jayaratne
e7bf1fb964 Remove more extra space after doc comments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:43:23 +05:30
Madhura Jayaratne
f344c26138 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-20 15:43:15 +05:30
Madhura Jayaratne
33c4f54618 Fix unit tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-17 15:05:17 +05:30
Dan Ungureanu
f9a88ad930 Old MySQL extension is not available in newer PHP versions. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-16 11:23:50 -04:00
Marc Delisle
965075452a Merge commit '0acbf99' 2015-04-14 13:29:43 -04:00
Marc Delisle
0acbf99549 Fix unit tests for Cloudflare support 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-14 13:27:08 -04:00
Marc Delisle
51f317690e Merge pull request #1644 from udan11/patch_1 
Old MySQL extension is not available in newer PHP versions.
 2015-04-13 15:13:24 -04:00
Dan Ungureanu
8cc3a7635c Old MySQL extension is not available in newer PHP versions. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-04-13 21:58:44 +03:00
Madhura Jayaratne
15e5c3d9f7 Do not use globals 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 19:23:52 +05:30
Madhura Jayaratne
2b1b872f63 Fix SQL export related tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 16:45:04 +05:30
Marc Delisle
106632bd66 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-07 15:12:49 -04:00
Marc Delisle
ca652921bb Merge pull request #1627 from whitepiegon/masterFeature1 
feature 844 structure in PDF export
 2015-04-02 15:34:58 -04:00
Aayush Anand
4b9ef9a757 feature 844 structure in PDF export squashed 
Signed-off-by: Aayush Anand <aayushism12@gmail.com>
 2015-04-03 00:51:33 +05:30
Marc Delisle
2e381cb248 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-04-01 11:19:11 -04:00
Madhura Jayaratne
c06c23f560 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 19:24:00 +05:30
Madhura Jayaratne
9f1f0e6bc1 Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-16 08:34:40 +05:30
Marc Delisle
c326cc9542 Merge pull request #1572 from tapanhalani/master 
Fix Feature#1609- Lock page navigation when entering data.
 2015-03-15 06:52:28 -04:00
Tapan Halani
0ac7e8f0f6 Fix feature#1609: Lock page navigation when entering data. 
Signed-off-by: Tapan Halani <tapanhalani231@gmail.com>
 2015-03-14 22:07:44 +05:30
Madhura Jayaratne
d162f4f3bd Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 15:32:46 +05:30
Madhura Jayaratne
9bf5792dc0 Merge branch 'QA_4_3' into QA_4_4 2015-03-09 14:48:43 +05:30
Madhura Jayaratne
1f630a1a97 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-09 14:02:34 +05:30
Madhura Jayaratne
6a9b787320 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 14:14:45 +05:30
Madhura Jayaratne
718e5227bb Use proper case 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-11 11:58:14 +05:30
Madhura Jayaratne
12446071ef Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 16:51:50 +05:30
Hugues Peccatte
7356b58b43 Add missing returns and update unit tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-08 14:31:17 +01:00
Madhura Jayaratne
20cf74c531 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 17:15:19 +05:30
Madhura Jayaratne
05c5ba753c Distinguish between index type and index choice 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 11:50:21 +05:30
Atul Pratap Singh
42706c33f7 Merge pull request #1469 from zixtor/master 
rfe #1574 Provide for a database select dropdown in navigation panel as in pre-4.0 versions
 2015-01-27 11:49:41 +05:30
Atul Pratap Singh
fc257c9904 Rename configuration option as ShowDatabasesNavigationAsTree with default true 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-27 11:31:03 +05:30
Atul Pratap Singh
cf3c433a9d Fix failing tests 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-27 10:42:24 +05:30