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

1079 Commits

Author SHA1 Message Date
Atul Pratap Singh
319285f13b Merge pull request #1671 from gzzhanghao/template 
Updates on PMA\Template class
 2015-05-21 23:13:44 +05:30
Madhura Jayaratne
6e69012eb4 #4912 "Highlight pointer" and "Row marker" doesn't work properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:01:57 +05:30
Madhura Jayaratne
45afaba1d0 Fix editor height in console 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 10:16:41 +05:30
Madhura Jayaratne
7a442e5d7f Increase z-index of the suggestions box 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 09:55:04 +05:30
Madhura Jayaratne
4c361d1e0f Show column types inline 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 16:12:14 +05:30
Madhura Jayaratne
aa78a54803 Add back phpMyAdmin specific colors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 16:00:55 +05:30
Madhura Jayaratne
f0838d4080 Upgrade CodeMirror to version 5.3.0 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 15:49:40 +05:30
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
05fd631ed8 Some fixes in page-related settings 
- Update 'original' theme
- Fix lock icon location when settings icon is not available

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-19 18:49:37 +05:30
Marc Delisle
c548513505 Merge branch 'QA_4_4' 2015-05-19 08:12:26 -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
Hugues Peccatte
cdd8868c94 Bug 4893: Fix X position in fast_filter input and vertical line of fast_filter input. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-16 23:37:56 +02:00
Madhura Jayaratne
f30648779c rfe #1669 Designer: "Sticky" menu option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-14 18:17:45 +05:30
Nisarg Jhaveri
93172dbc70 Show hint for column autocomplete in better way 
Separate column name and extra information in better way in
autocomplete

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-09 16:18:41 +05:30
Madhura Jayaratne
648ea27e5a Fix syntax error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-04 08:19:10 +05:30
Madhura Jayaratne
9cd65ce4de #4885 Some icons are above the overlay of jQuery dialogs - more instances 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-04 08:16:50 +05:30
Madhura Jayaratne
e371ef514c Merge branch 'QA_4_4' 2015-05-04 08:13:35 +05:30
Madhura Jayaratne
31ab6f5bb2 bug #4885 Some icons are above the overlay of jQuery dialogs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-04 08:12:27 +05:30
Madhura Jayaratne
b9050431e1 Style buttons 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-01 17:42:36 +05:30
Madhura Jayaratne
d95faf3b65 Update jQuery-ui styles 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-01 17:15:43 +05:30
Madhura Jayaratne
a17e5c5318 Style jQuery dialog to match original theme 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-01 16:57:37 +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
87b00b9591 Fix resize icon in Designer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-30 06:29:02 +05:30
Madhura Jayaratne
774940b43c vertically align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-29 10:22:19 +05:30
Madhura Jayaratne
8d8b2677db Merge branch 'QA_4_4' 2015-04-21 11:34:37 +05:30
Madhura Jayaratne
2981728987 bug #4862 Misaligned Inline edit field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-21 11:33:16 +05:30
Marc Delisle
223b205866 Merge commit '9a04e80' 2015-04-15 08:03:17 -04:00
Madhura Jayaratne
408ea68f84 #4853 Relation view between 1600 and 1780 px 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-14 13:11:13 +05:30
Madhura Jayaratne
abe7f3bdcd Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 14:36:18 +05:30
Madhura Jayaratne
d56b35ec08 bug #4850 Relation view on 1920 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-13 14:34:44 +05:30
Madhura Jayaratne
0d2cb6e29b Remove icon used for query window 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:47:09 +05:30
Madhura Jayaratne
251a6282e2 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:37:07 +05:30
Madhura Jayaratne
d32f555a56 bug Missing sort icons in monitor 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-27 10:35:16 +05:30
harish095
ef5f956224 Dark Theme for Console 
Signed-off-by: Harish Kandala <kandalaharish95@gmail.com>
 2015-03-21 20:54:14 +05:30
harish095
c9aa31c8d7 Minor UI bug fix in designer 
Signed-off-by: harish095 <kandalaharish95@gmail.com>
 2015-03-17 07:54:16 +05:30
Marc Delisle
ba7a38f5c4 Merge commit '2f7d6cb' 2015-03-13 08:55:17 -04:00
Marc Delisle
edb1fc8ec0 Merge commit '2f7d6cb' into QA_4_4 2015-03-13 08:52:31 -04:00
Marc Delisle
3f62197019 Bug #4786: also fix the original theme 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-13 08:49:36 -04:00
Andrea Vallorani
7934919b9e Bug #4786 SELECT width on relations page 
Signed-off-by: Andrea Vallorani andrea.vallorani@gmail.com
 2015-03-13 08:47:52 -04:00
Madhura Jayaratne
bedc7d1f5b Remove unused chart colors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-12 17:21:03 +05:30
Madhura Jayaratne
aa74cd29fb Styles were affecting edit columns as well as edit central columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-11 18:47:33 +05:30
Marc Delisle
a3b95b6951 Merge pull request #1555 from devenbansod/feat-req-1614 
Tries to implement RFE #1614.
 2015-03-10 12:18:44 -04:00
Deven Bansod
6bfe67c82b Tries to implement RFE #1614. 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-03-11 02:00:48 +05:30
Marc Delisle
dff3e9f885 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-03 15:44:08 -05:00
Marc Delisle
17932ae84b Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-03 15:37:42 -05:00
tapanhalani
b661cd7c9b Fix bug#4746:- Right-aligned columns have left-aligned header 
Signed-off-by: tapanhalani <tapanhalani231@gmail.com>

Fix bug#4746: Right-aligned columns have left-aligned header

Signed-off-by: tapanhalani <tapanhalani231@gmail.com>
Fix bug#4746:- Right-aligned columns have left-aligned header.

Fix bug#4746- Right-aligned columns have left-aligned header

Signed-off-by: tapanhalani <tapanhalani231@gmail.com>
Fix bug#4746:- Right-aligned columns have left-aligned header.

Signed-off-by: tapanhalani <tapanhalani231@gmail.com>

Fix bug#4746- Right-aligned columns have left-aligned header.

Signed-off-by: tapanhalani <tapanhalani231@gmail.com>

Fix bug#4746:- Right-aligned columns have left-aligned headers.

Signed-off-by: Tapan Halani <tapanhalani231@gmail.com>
 2015-03-04 00:38:20 +05:30
Madhura Jayaratne
71ee86196b rfe #501 Support for SSL GRANT option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-27 15:53:12 +05:30
Madhura Jayaratne
cf70ed404f Merge branch 'QA_4_3' 2015-02-23 18:53:32 +05:30
Deven Bansod
6c96b00713 Fix bug #4753 | Added a 6px margin to Textarea fields 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-02-23 07:57:31 -05:00