Commit Graph

54 Commits

Author SHA1 Message Date
Hugues Peccatte
00bd7f02f3 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-08-24 19:36:16 +02:00
Madhura Jayaratne
1391c3a097 Move designer related templates into database folder
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-08-10 10:56:39 +05:30
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-19 00:18:38 +03:00
Madhura Jayaratne
b0ae16fcd6 These are also internal directives. Remove underscore to match with other similar ones
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-07-09 17:15:10 +05:30
Deven Bansod
2e6abf3cb2 Modified structure for pma__designer_settings table
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-29 13:33:42 +05:30
Deven Bansod
3d1157c944 Changed the mysql reserved words conflicting column names
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-25 00:14:06 +05:30
Madhura Jayaratne
903000ce1b Specify types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-24 07:41:16 +05:30
Madhura Jayaratne
3ff7a26426 Use 'username' instead of 'user' to be consistent with other phpMyAdmin tables
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-23 20:05:47 +05:30
Deven Bansod
54a480e8eb Designer settings saved in a new table in configuration storage
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-06-21 15:44:39 +05:30
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
Madhura Jayaratne
204e8c23c6 Add spaces around concat
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-06 10:06:46 +05:30
Madhura Jayaratne
4ab6f29302 These images does not seem to be used
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-30 18:45:59 +05:30
Madhura Jayaratne
82b8b628a9 Remove redundant code
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-30 18:44:04 +05:30
Madhura Jayaratne
cb9671d9fe Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-30 07:58:52 +05:30
Madhura Jayaratne
e726b47831 bug #4880 Designer icons missing when using original theme
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-30 07:55:09 +05:30
Madhura Jayaratne
621d1a4b0b Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-30 07:06:47 +05:30
Madhura Jayaratne
beeb38b13d bug #4879 Exit fullscreen in Designer does not change the button text
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-30 06:58:51 +05:30
Madhura Jayaratne
88514e5b8b Fix syntax errors
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 23:24:36 +05:30
Madhura Jayaratne
e80e9f81af Wrap more long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 23:16:41 +05:30
Madhura Jayaratne
01051dc93f Wrap some long lines
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-24 23:09:04 +05:30
Madhura Jayaratne
43797ad8e1 It makes more sense to order by page name
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-08 10:25:51 +05:30
Marc Delisle
c8ca80d1c4 Performance: do not compute the count on each iteration
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-30 13:47:17 -04:00
Marc Delisle
c6052ace97 Merge pull request #1618 from pratiksethia1/minorCorrections
changes titles and minor correction
2015-03-30 07:33:03 -04:00
pratiksethia1
3236ce0153 changes titles
Signed-off-by: Pratik Sethia <pratiksethia1@gmail.com>
2015-03-30 05:05:39 +05:30
harish095
69063ae4a5 Bug fix #4792
Signed-off-by: harish095 <kandalaharish95@gmail.com>
2015-03-17 08:05:47 +05:30
Madhura Jayaratne
6642772f43 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-23 11:59:37 +05:30
Madhura Jayaratne
55dccb6138 bug #4777 Some images are missing in Designer for original theme
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-23 11:58:26 +05:30
Marc Delisle
eca87c132f Clarify function name
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-10 02:50:37 -05:00
Marc Delisle
c74ed185d4 New icon for Pin text
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-02-10 02:42:16 -05:00
Zhang Hao
6888b4c50b New designer menu
Signed-off-by: Zhang Hao <jason.daurus@gmail.com>
2015-02-09 22:04:04 +08:00
Madhura Jayaratne
b940264946 Multi byte functions are not needed to match types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 17:48:08 +05:30
Hugues Peccatte
42e0bdd47a Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 18:32:42 +01:00
Hugues Peccatte
037a034b43 Minor coding style modifications.
Fix typos.
PHPDoc and JSDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 14:04:35 +01:00
Hugues Peccatte
e17de11c74 Improve multibytes string manipulation performances.
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 17:40:09 +01:00
Marc Delisle
b17ff5be2c Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-29 12:43:07 -04:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Smita Kumari
28622a4bcc fixing coding style
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-10-22 22:53:35 +05:30
Smita Kumari
d87a99e01c moving inline js out from db_designer.lib.php plus minor bug fixes
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-10-21 12:40:09 +05:30
Hugues Peccatte
70a21ec25c Merge from master.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-08 21:49:37 +02:00
Madhura Jayaratne
482fc39e5c Add missing quotes
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-03 21:03:14 +05:30
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls.
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-28 20:53:01 +02:00
Hugues Peccatte
5985894160 Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-07 00:31:45 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 10:44:03 +02:00
Madhura Jayaratne
8d95c4ec4f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-08-26 17:43:53 +05:30
Madhura Jayaratne
03f3ad8144 Hide PDF page related icon in visual builder
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-08-26 17:43:18 +05:30
Marc Delisle
b520496b5c Fix typo
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-26 08:03:25 -04:00
Madhura Jayaratne
17a56337c5 Value of the passed parameter is 'editPage'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-08-26 17:09:29 +05:30
Madhura Jayaratne
dc8f2c5606 Properly mark saved status for new pages
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-08-24 08:58:13 +05:30
Madhura Jayaratne
681bca3560 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-08-24 07:36:53 +05:30