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

109144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Giovanni Sora
aca211af86 Translated using Weblate (Interlingua) 
Currently translated at 75.6% (2417 of 3194 strings)

[CI skip]
 2017-03-01 22:19:56 +01:00
Michal Čihař
cabe08416d Merge branch 'QA_4_7' 2017-03-01 22:19:40 +01:00
Michal Čihař
27bebd75bd Fix parameter name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 22:19:26 +01:00
tmtisfree
2ddd85880b Translated using Weblate (French) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-01 21:37:22 +01:00
Παναγιώτης Παπάζογλου
0147569caa Translated using Weblate (Greek) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-01 20:54:53 +01:00
Domen
ec5ff9e263 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-01 20:53:03 +01:00
Burak Yavuz
b17a0f91cc Translated using Weblate (Turkish) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2017-03-01 19:13:54 +01:00
Michal Čihař
f2eac37c1e Merge branch 'QA_4_7' 2017-03-01 18:46:22 +01:00
Michal Čihař
16567c6b2b Do not rely on xargs 
It does not work as expected on OSX.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 18:46:17 +01:00
Michal Čihař
d3fe2991d0 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 18:20:06 +01:00
Michal Čihař
67cb11dfd5 Merge branch 'QA_4_7' 2017-03-01 18:19:39 +01:00
Michal Čihař
6ad9436394 Simplify installation 
The upgrade does not seem to work anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 18:19:34 +01:00
Michal Čihař
059685c348 Merge branch 'QA_4_7' 2017-03-01 18:08:35 +01:00
Michal Čihař
3fdf343899 Use installed pip for better caching 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 17:48:08 +01:00
Michal Čihař
a06669d83d Document why we install some packages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:59:46 +01:00
Michal Čihař
2b42777cdf Leverage pip cache instead of using apt packages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:57:26 +01:00
Michal Čihař
2fea612791 Simplify code for skipping not supported PHP versions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:53:23 +01:00
Michal Čihař
db62cf1bf4 There is no phpenv on OSX 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:52:08 +01:00
Michal Čihař
4f37569773 Do not use ant on Travis 
It is just additional overhead without real benefit.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:51:06 +01:00
Michal Čihař
0b0e99cc02 Remove no longer needed exclude 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:50:08 +01:00
Michal Čihař
b4326fcc3d Remove and cleanup from Travis 
It should not be necessary at all as we start with clean environment.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:49:59 +01:00
Michal Čihař
f3425986b5 Generate locales without ant 
Removes ant overhead.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:49:50 +01:00
Michal Čihař
bdaab73967 Squeeze lint into test build 
- the setup costs are quite high, so do both steps at once
- lint only changed files
- always generate locales for tests to simplify code

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:49:40 +01:00
Michal Čihař
6e78d489ee Use unicode for quotes 
There is no need to use html entities.

Issue #12987

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:20:14 +01:00
Michal Čihař
dfa7995451 Include quotes directly in the string 
This makes it easier for tranlators to handle.

Issue #12987

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 16:19:54 +01:00
Michal Čihař
0a8490f711 Merge remote-tracking branch 'origin/pull/12987' 2017-03-01 16:16:43 +01:00
Michal Čihař
2c55ecc450 Merge branch 'QA_4_7' 2017-03-01 15:57:24 +01:00
Michal Čihař
b7a87ce156 Adjust tests to new column selection code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:57:18 +01:00
Michal Čihař
585967b7e4 Fix columns selection in case of query fails 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:57:09 +01:00
Michal Čihař
19aad41506 Merge branch 'QA_4_7' 2017-03-01 15:53:02 +01:00
Michal Čihař
9d13e3d143 Display first char field for foreign key if nothing is configured 
In most cases this is what users want to see and anyway it is way better
than showing nothing.

Issue #12835

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:52:05 +01:00