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

90807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
cd8554766f Merge commit '20d9329' 2014-03-22 12:51:11 -04:00
Weblate
baaac88363 Merge remote-tracking branch 'origin/master' 2014-03-22 16:34:05 +01:00
Yungu Kim
e7acb2a40e Translated using Weblate (Korean) 
Currently translated at 72.9% (2010 of 2756)
 2014-03-22 16:34:02 +01:00
Madhura Jayaratne
3bea7c584a Add missing space 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-03-22 21:00:51 +05:30
Weblate
3015016bd5 Merge remote-tracking branch 'origin/master' 2014-03-22 12:00:14 +01:00
Diogo Santos
2283f00e91 Translated using Weblate (Portuguese) 
Currently translated at 52.9% (1458 of 2756)
 2014-03-22 12:00:11 +01:00
Yungu Kim
7baad886e5 Translated using Weblate (Korean) 
Currently translated at 71.7% (1978 of 2756)
 2014-03-22 12:00:08 +01:00
Weblate
20d93299bc Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-22 11:57:52 +01:00
Diogo Santos
9b10cd174f Translated using Weblate (Portuguese) 
Currently translated at 61.2% (1683 of 2749)
 2014-03-22 11:57:50 +01:00
Yungu Kim
5df632fe34 Translated using Weblate (Korean) 
Currently translated at 76.7% (2111 of 2749)
 2014-03-22 11:57:48 +01:00
Marc Delisle
5cc34519b8 4.1.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-22 06:56:56 -04:00
Marc Delisle
07d41461e5 Merge commit '8978ac5' 2014-03-22 06:55:53 -04:00
Marc Delisle
438df31954 Merge commit '454cc7c' 2014-03-22 06:55:34 -04:00
Marc Delisle
8978ac5bcc 4.1.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-22 06:54:45 -04:00
Marc Delisle
bab0572c1e Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-21 12:42:10 -04:00
Michal Čihař
bc505831ae Try to limit browser set to see if it helps running testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-21 07:26:36 +01:00
Michal Čihař
e2bc0f6aff Merge pull request #1075 from kb-yashodha/refactoring 
Refactor - Move duplicate code to a parent class
 2014-03-21 07:01:31 +01:00
Bimal Yashodha
ae7830985f Correct spelling mistakes 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-03-21 07:11:27 +05:30
Madhura Jayaratne
a3c63c3c68 Avoid conflicting selectors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-03-21 00:36:12 +05:30
Bimal Yashodha
b362d0e8b6 Move getTitle() method to parent class 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-03-20 22:48:22 +05:30
Michal Čihař
2e867368e0 Ignore Ant cache files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 13:05:53 +01:00
Marc Delisle
3811fc4070 Incorrect coding style fix 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-20 06:47:11 -04:00
Marc Delisle
2eab950ae8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-20 06:38:21 -04:00
Michal Čihař
82be0d51ca Merge remote-tracking branch 'origin/QA_4_1' 2014-03-20 10:18:59 +01:00
Weblate
454cc7ca72 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-20 10:18:54 +01:00
Anawin Wongsadit
f92b4afbbd Translated using Weblate (Thai) 
Currently translated at 42.0% (1157 of 2749)
 2014-03-20 10:18:51 +01:00
Peter Sone Koldkjær
23c4f3eea2 Translated using Weblate (Danish) 
Currently translated at 99.8% (2746 of 2749)
 2014-03-20 10:18:48 +01:00
Michal Čihař
c56523bebd Allow styles from ourselves in CSP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 10:18:42 +01:00
Michal Čihař
2ed12092ec Show only errors from php lint 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 10:08:27 +01:00
Weblate
7ebf9d1f5a Merge remote-tracking branch 'origin/master' 2014-03-20 09:39:27 +01:00
Anawin Wongsadit
2c10e75ace Translated using Weblate (Thai) 
Currently translated at 39.0% (1077 of 2756)
 2014-03-20 09:39:24 +01:00
Peter Sone Koldkjær
19a94ed9f9 Translated using Weblate (Danish) 
Currently translated at 92.8% (2558 of 2756)
 2014-03-20 09:39:22 +01:00
Michal Čihař
edcd09ca1b Remove trailing whitespace from the documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 09:39:07 +01:00
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 09:36:48 +01:00
Marc Delisle
582077e8db Merge pull request #1079 from vpowerrc/bug#4332 
fixed bug_#4332 - Copy table no longer copies indexes
 2014-03-19 17:24:16 -04:00
Michal Čihař
80e466a58d Merge remote-tracking branch 'origin/QA_4_1' 2014-03-19 21:39:34 +01:00
Michal Čihař
eab5d68b9d Fix typo in CSP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 21:39:23 +01:00
Michal Čihař
a415e6c5c1 Merge remote-tracking branch 'origin/QA_4_1' 2014-03-19 21:37:15 +01:00
Michal Čihař
5cb584b963 Allow inline styles in CSP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 21:36:53 +01:00
Viduranga Wijesooriya
d93bb1aa87 fixed bug_#4332 - Copy table no longer copies indexes 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-03-20 00:44:23 +05:30
Michal Čihař
36e33b110e Update make.bat as well for current Sphinx 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 19:01:10 +01:00
Michal Čihař
f41f224aa1 Merge branch 'docs-improvement' 2014-03-19 19:00:10 +01:00
Michal Čihař
dec715e5d8 Replace tabs with spaces 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 18:59:36 +01:00
Michal Čihař
d31280c10f Merge pull request #1078 from nijel/docs-improvement 
Update Sphinx documentation template to latest version
 2014-03-19 18:56:41 +01:00
Michal Čihař
870e3f0113 Update Sphinx documentation template to latest version 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 18:55:33 +01:00
Bimal Yashodha
ccde0e70bd Rename the field to its old value 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-03-19 23:08:22 +05:30
Marc Delisle
b04c5d6334 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-19 12:55:37 -04:00
Marc Delisle
a1183ec0ec Replace tabs with correct indentation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-19 12:54:47 -04:00
Michal Čihař
b2a37601fe Merge pull request #1076 from bfabiszewski/master 
Fix for missing 'Trigger' menu for older MySQL versions
 2014-03-19 16:28:30 +01:00
Michal Čihař
3ba249176a Remove incomplete @covers annotations 
PHPUnit now uses these to list code which is covered and was not listed
in @covers, what produces quite a lot of errors. I don't think we really
need to explicitely list those directives.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 16:04:20 +01:00