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

99872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
d248f77458 Fix issues 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-21 15:03:24 -04:00
Marc Delisle
b3b2360c75 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-05-21 14:27:39 -04:00
Marc Delisle
8d4f2cb4b0 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-21 14:27:36 -04:00
Atul Pratap Singh
319285f13b Merge pull request #1671 from gzzhanghao/template 
Updates on PMA\Template class
 2015-05-21 23:13:44 +05:30
Jason
be584def3c Fix update-po script 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-22 00:05:29 +08:00
Madhura Jayaratne
9ba6455a82 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:07:12 +05:30
Madhura Jayaratne
0ac438a081 ChangeLog entry for bug #4912 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:05:30 +05:30
Madhura Jayaratne
a59ffb9654 #4912 "Highlight pointer" and "Row marker" doesn't work properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:04:43 +05:30
Madhura Jayaratne
f1ac39c28d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-21 19:02:59 +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
Weblate
a84af805ca Merge remote-tracking branch 'origin/master' 2015-05-21 14:55:57 +02:00
Michal Čihař
0ce5620570 Translated using Weblate (Portuguese) 
Currently translated at 57.7% (1790 of 3099 strings)

[CI skip]
 2015-05-21 14:55:54 +02:00
Madhura Jayaratne
76f1f58102 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-21 18:24:37 +05:30
Madhura Jayaratne
5d3ed16e18 Simplify 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 18:23:09 +05:30
Alexandre Badalo
ac2f9acaa3 Translated using Weblate (Portuguese) 
Currently translated at 59.1% (1796 of 3035 strings)

[CI skip]
 2015-05-21 13:23:58 +02:00
Alexandre Badalo
71b3a7270a Translated using Weblate (Portuguese) 
Currently translated at 57.7% (1790 of 3099 strings)

[CI skip]
 2015-05-21 13:23:48 +02:00
Jason
b47dd0fe65 Fix an typo cause FieldKey_*.png not resolve correctly 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-21 17:36:46 +08:00
Madhura Jayaratne
a4651f896c Navi legacy - Do not show database dropdown when no database is selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 11:16:22 +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
90083aaf03 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-21 09:48:05 +05:30
Madhura Jayaratne
62f07fef15 Use a single function to initialize CodeMirror editors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 09:46:49 +05:30
Weblate
89d3ffe8d1 Merge remote-tracking branch 'origin/master' 2015-05-21 03:43:32 +02:00
Sevdimali İsa
232f44a8d2 Translated using Weblate (Azerbaijani) 
Currently translated at 57.3% (1777 of 3100 strings)

[CI skip]
 2015-05-21 03:43:28 +02:00
Madhura Jayaratne
ad289aab6c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-21 07:13:12 +05:30
Madhura Jayaratne
070e549a82 Make CodeMirror editors resizable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 07:11:57 +05:30
Domen
fbde6088d0 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3099 of 3099 strings)

[CI skip]
 2015-05-20 22:48:36 +02:00
Isaac Bennetch
a9cd7d5604 Merge pull request #1683 from devenbansod/657corrections 
'Realign Privileges' should be shown only when EDITING
 2015-05-20 11:24:44 -04:00
Isaac Bennetch
ff169e51ef Merge pull request #1681 from devenbansod/1485Corrections 
Fixed some issues in Pull#1662 commit for RFE#1485
 2015-05-20 11:15:43 -04:00
Weblate
8297dd684d Merge remote-tracking branch 'origin/master' 2015-05-20 16:49:46 +02:00
dingo thirteen
e933372dd3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3100 of 3100 strings)

[CI skip]
 2015-05-20 16:49:43 +02:00
Marc Delisle
834c35044d Remove a loose comparison warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-20 10:49:36 -04:00
Jason
c6cffd6ef9 Fix database_tables.phtml 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-20 21:55:16 +08:00
Marc Delisle
9c42b7796d Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-20 09:02:04 -04:00
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
52f8f6080e ChangeLog entry for bug #4913 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 16:00:27 +05:30
Madhura Jayaratne
c943771434 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-20 15:50:53 +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
Weblate
49fe9d4196 Merge remote-tracking branch 'origin/master' 2015-05-20 09:10:45 +02:00
Burak Yavuz
364be7787e Translated using Weblate (Turkish) 
Currently translated at 99.9% (3097 of 3098 strings)

[CI skip]
 2015-05-20 09:10:41 +02:00
Madhura Jayaratne
f2720fa1fc Not required since page_contents is replaced 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 12:40:08 +05:30
Madhura Jayaratne
c4517f98c9 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 09:16:43 +05:30
Weblate
0d81487713 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-20 05:41:34 +02:00
Παναγιώτης Παπάζογλου
03f0929234 Translated using Weblate (Greek) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-20 05:41:31 +02:00
Marc Delisle
18518f9669 Translated using Weblate (French) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-20 05:41:30 +02:00
Madhura Jayaratne
9294bf9ce1 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 09:11:05 +05:30
Madhura Jayaratne
af08e1417e bug #4911 Lock page icon is not shown after fresh reload 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-20 09:08:49 +05:30
Weblate
565ee39527 Merge remote-tracking branch 'origin/master' 2015-05-20 03:46:43 +02:00
Burak Yavuz
87725eefa5 Translated using Weblate (Turkish) 
Currently translated at 99.2% (3074 of 3098 strings)

[CI skip]
 2015-05-20 03:46:39 +02:00