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

90781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Bartek Fabiszewski
068c3422ea Fix for missing 'Trigger' menu for older MySQL versions 
Signed-off-by: Bartek Fabiszewski <github@fabiszewski.net>
 2014-03-19 15:53:20 +01:00
Michal Čihař
e3c672290b Fixed return value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 15:17:50 +01:00
Michal Čihař
49cf2db79f Switch back to chrome for CI testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 14:58:07 +01:00
Michal Čihař
a52d5faf3e Disable debug mode, does not work with Safari 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 14:38:44 +01:00
Michal Čihař
5162cbdff7 Disable Safari testing of testAddData, it is broken 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 14:38:13 +01:00
Michal Čihař
6a17988020 Add missing wait for elements after login 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 14:36:46 +01:00
Michal Čihař
acb18deb82 Need to skip the test explicitely before alert is open 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 14:34:14 +01:00
Michal Čihař
5fc548191f Enabled BrowserStack debug 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 14:13:27 +01:00
Michal Čihař
36e5ebad03 Single place to define per browser skips 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 14:09:11 +01:00
Michal Čihař
ff34105afa Ensure logout before doing login testing (needed for session sharing) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 13:58:58 +01:00
Michal Čihař
abe0f08cec Skip alert testing for Safari, not supported there 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 13:45:16 +01:00
Michal Čihař
761ec6bcd0 Need to wait for element to be present 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 13:43:03 +01:00
Michal Čihař
e464f1326a Disable MSIE testing, looks too broken for now 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:56:25 +01:00
Michal Čihař
c2ea2ca027 Test with Safari for now 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:51:39 +01:00
Michal Čihař
9a56641d0d Document possible todo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:40:14 +01:00
Michal Čihař
2456af7a01 Remove no longer used JSON plugin for jQuery 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:33:46 +01:00
Michal Čihař
5284882d3d Use native browser support for JSON 
It's there in anything recent (only not supported in IE 6 and 7 which we
don't support anyway).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:33:46 +01:00
Michal Čihař
0d8f510c22 Use JSON parser from jQuery instead of JSON plugin 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:33:46 +01:00
Michal Čihař
8316786c95 Merge remote-tracking branch 'origin/QA_4_1' 2014-03-19 12:19:40 +01:00
Michal Čihař
5199ad8dc2 Add Content-Security-Policy header 
This is standard and obsoletes X-Content-Security-Policy and
X-Webkit-CSP, but we still keep the old ones to provide headers for old
browsers.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:16:55 +01:00
Michal Čihař
786256469c Allow www.google.com only in case we are using reCAPTCHA 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 12:16:55 +01:00
Dieter Adriaenssens
6b3db1deb3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2756 of 2756)
 2014-03-19 11:44:08 +01:00
Michal Čihař
a2964da560 Merge remote-tracking branch 'origin/QA_4_1' 2014-03-19 11:15:01 +01:00
Michal Čihař
c2ed8d3865 Simplify build script for hhvm/normal php cases 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-19 11:14:41 +01:00