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

109175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chien Wei Lin
2e30bb3ee5 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 99.8% (3190 of 3194 strings)

[CI skip]
 2017-03-08 15:43:19 +01:00
Michal Čihař
2d8b8a8b60 Merge branch 'QA_4_7' 2017-03-06 14:50:57 +01:00
Michal Čihař
4312b16a54 Avoid using symlinks in certificate storage 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 14:50:40 +01:00
Michal Čihař
214a2b6b34 Rewrite SSL verification code for curl 
It seems that the curl extension is quite tricky what can be set. You
can not set both CURLOPT_CAINFO and CURLOPT_CAPATH. Unfortunately some
systems seem to have built in defaults for one of these which can not be
figured out of PHP. So let's just try the three options which make
sense.

Issue #12846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 14:48:35 +01:00
Michal Čihař
3d24d08e41 Show system variables on error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 14:31:07 +01:00
Michal Čihař
b71371a913 Move certificates to separate directory 
- this makes it easier to manage
- overriding capath seems to have priority

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 14:13:59 +01:00
Michal Čihař
0a5b9de084 Try to debug test failure on Travis 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:56:58 +01:00
Michal Čihař
b89f568e1c Check whether setting options did succeed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:50:05 +01:00
Michal Čihař
a6a917e262 Remove github from tests 
We no longer access it directly.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:42:48 +01:00
Michal Čihař
6ca6685ee0 Merge branch 'QA_4_7' 2017-03-06 13:07:28 +01:00
Michal Čihař
a011f987ee Merge remote-tracking branch 'origin/QA_4_7' 2017-03-06 13:07:24 +01:00
Michal Čihař
43148087bf Translated using Weblate (Czech) 
Currently translated at 93.5% (2987 of 3194 strings)

[CI skip]
 2017-03-06 13:07:03 +01:00
Michal Čihař
47863a25b5 Bundle ISRG Root X1 SSL certificate and use it for verification 
This way we avoid problems with misconfigured curl in some PHP
installations (WAMP), which has no trust certificates.

Fixes #12846

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:06:40 +01:00
Michal Čihař
3edb0d5df0 Fold configureCurl into httpRequestCurl 
There is no longer need to have it separate.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 13:00:34 +01:00
Michal Čihař
39f4b3dd40 Use our CDN for fetching git commit information 
We can avoid GitHub rate limiting this way as we do the requests from
the website backend and they are cached by CDN.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-06 12:54:52 +01:00
Michal Čihař
c1348b957a Translated using Weblate (Czech) 
Currently translated at 93.6% (2990 of 3192 strings)

[CI skip]
 2017-03-06 12:53:39 +01:00
tmtisfree
04c66a6fbe Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-05 15:45:02 +01:00
tmtisfree
6c325b8dcb Translated using Weblate (French) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-05 15:44:55 +01:00
Michal Čihař
bdbe2006d1 Merge branch 'QA_4_7' 2017-03-03 14:50:26 +01:00
Michal Čihař
63831106ec Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-03 14:50:10 +01:00
Michal Čihař
bda81b6ed1 Merge branch 'QA_4_7' 2017-03-03 14:48:58 +01:00
Michal Čihař
f27b33fe70 Merge remote-tracking branch 'origin/QA_4_7' 2017-03-03 14:48:55 +01:00
Andrzej Pauli
3b3f062b37 Translated using Weblate (Polish) 
Currently translated at 82.2% (2627 of 3194 strings)

[CI skip]
 2017-03-03 14:48:38 +01:00
Michal Čihař
f0485f6460 Add missing server parameter to several javascript requests 
Also use PMA_commonParams where applicable.

Issue #13047

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-03 14:48:11 +01:00
Michal Čihař
dbce3b54d1 Fix query simulating for more servers 
The server parameter was missing.

Fixes #13047

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-03 14:48:11 +01:00
Andrzej Pauli
3f918a8c7f Translated using Weblate (Polish) 
Currently translated at 82.3% (2630 of 3192 strings)

[CI skip]
 2017-03-03 14:48:02 +01:00
Michal Čihař
68c5cef0d5 Merge branch 'QA_4_7' 2017-03-02 15:30:20 +01:00
Artem Hryn
6014898779 Include 100% font size in the selection 
Fixes #13028

Signed-off-by: Artem Hryn <plartem01@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 15:30:10 +01:00
Michal Čihař
73ee7af236 Merge branch 'QA_4_7' 2017-03-02 14:31:18 +01:00
Michal Čihař
7d8b1de6ee Merge commit 'f3b44765eca8f3634f3a2574a678f5c503f2335b' 2017-03-02 14:31:12 +01:00
Michal Čihař
d8604d8de8 Translated using Weblate (Czech) 
Currently translated at 93.5% (2987 of 3194 strings)

[CI skip]
 2017-03-02 14:30:39 +01:00
Weblate
cd6d9b0abd Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-02 14:30:02 +01:00
Michal Čihař
877eb4b433 Translated using Weblate (Czech) 
Currently translated at 93.6% (2990 of 3192 strings)

[CI skip]
 2017-03-02 14:29:59 +01:00
Michal Čihař
f3b44765ec Merge pull request #13041 from nijel/hhvm 
Test against multiple HHVM versions
 2017-03-02 14:29:51 +01:00
Michal Čihař
cbcad52b0e List longest lasting tests from the json log 
Generate JSON report for tests and include it in output

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 13:31:08 +01:00
anonymous
6249fe538f Translated using Weblate (Czech) 
Currently translated at 93.5% (2987 of 3194 strings)

[CI skip]
 2017-03-02 11:08:21 +01:00
Michal Čihař
ce9ca75555 Avoid skipping tests on hhvm 
They seems to be quite slow on later versions, but work.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 10:20:22 +01:00
Michal Čihař
118e139ae8 Try with sudo required 
According to some comments in travis-ci/travis-ci#6842 this should
fix the issue with MySQL server.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 10:03:04 +01:00
Michal Čihař
4a2af38d39 Do not add git-core repo, it seems to be already there 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 09:24:54 +01:00
Michal Čihař
52a5ae9bb2 Force install mysql server 
It does not seem to be always present on Trusty.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 09:24:36 +01:00
Michal Čihař
b53ec4dc9c Upgrade Travis to Trusty 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 09:23:58 +01:00
Michal Čihař
1739793a9d Test against multiple HHVM versions 
Issue #13040

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 09:23:58 +01:00
Michal Čihař
846180cac0 Merge branch 'QA_4_7' 2017-03-02 09:20:47 +01:00
Michal Čihař
5c68ef4dc2 Merge remote-tracking branch 'origin/QA_4_7' 2017-03-02 09:20:44 +01:00
Michal Čihař
e4c5401e6c Properly escape MIME transformatoin names 
Fixes #13045

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 09:19:37 +01:00
Madhura Jayaratne
f66f3565c0 Add missing <thead> tags and fix colspan 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-03-02 09:15:40 +11:00
Weblate
05112e946a Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-01 22:20:01 +01:00
Weblate
0f6d615f29 Merge remote-tracking branch 'origin/master' 2017-03-01 22:19:59 +01:00
Giovanni Sora
ae20336bdf Translated using Weblate (Interlingua) 
Currently translated at 75.6% (2416 of 3192 strings)

[CI skip]
 2017-03-01 22:19:59 +01:00
tmtisfree
c145103f40 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-01 22:19:58 +01:00