gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,058 Commits 12 Branches 481 Tags 2.4 GiB
4a8d77cc69
Commit Graph

105058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
4a8d77cc69 Merge branch 'QA_4_6' 2016-02-09 16:54:16 +01:00
Michal Čihař
84ed3ae6ca Correctly document what this function expects 
Issue #11930, #11931

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 16:53:37 +01:00
Michal Čihař
ef7114d850 Merge branch 'QA_4_5' into QA_4_6 2016-02-09 16:53:06 +01:00
Michal Čihař
afe00d7c10 The storage engine needs to be upper case all the time 
So far the current was uppercase, but the possibly new was lower case
leading to many weird effects.

Fixes #11930

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 16:51:20 +01:00
Michal Čihař
46c3f0dc22 Merge branch 'QA_4_6' 2016-02-09 16:44:44 +01:00
Michal Čihař
9016fd6a72 Changelog entry for #11880 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 16:44:35 +01:00
Michal Čihař
a6eb9468b1 Merge remote-tracking branch 'origin/pull/11880' into QA_4_6 2016-02-09 16:44:08 +01:00
Durgesh
de28889a30 Fix HTML rendering in error message, Issue #11872 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-09 16:10:15 +05:30
Michal Čihař
a6b4735aee Merge branch 'QA_4_6' 2016-02-09 11:01:40 +01:00
Michal Čihař
3ebacb0025 Simplify loading of vendor configuration 
Do it just once and very early, so that all scripts can rely on it being
available.

Fixes autoloading of phpseclib.

Fixes #11914

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 11:00:54 +01:00
Michal Čihař
b496cec40c Changelog entry for #11924 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-09 10:55:18 +01:00
Michal Čihař
bf2f02180d Merge pull request #11927 from nijel/nocache-version 
Remove MySQL version caching
 2016-02-09 10:53:07 +01:00
Michal Čihař
adea0dddac Merge branch 'QA_4_6' 2016-02-09 10:49:50 +01:00
Michal Čihař
e83b3d264b Merge commit 'e821a2679302a6176a5da79813431756c529923d' 2016-02-09 10:49:46 +01:00
Weblate
07fab97f80 Merge remote-tracking branch 'origin/master' 2016-02-09 10:49:25 +01:00
Παναγιώτης Παπάζογλου
4cf308233c Translated using Weblate (Greek) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-09 10:49:23 +01:00
Michal Čihař
d3adace4b7 Merge pull request #11928 from bamarni/composer-no-dev 
[doc] Installation with Composer - add --no-dev option
 2016-02-09 10:49:17 +01:00
Bilal Amarni
db270f86fb [doc] Installation with Composer - add --no-dev option 
Otherwise it installs multiple dependencies not needed for
running PhpMyAdmin (phpunit, code sniffer, etc.).

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
 2016-02-09 10:49:10 +01:00
Παναγιώτης Παπάζογλου
e821a26793 Translated using Weblate (Greek) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 21:43:24 +01:00
Weblate
5f1a5ac2ca Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-08 16:43:39 +01:00
Domen
e04461b195 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:43:39 +01:00
Seongki Shin
1454dc0da9 Translated using Weblate (Korean) 
Currently translated at 78.0% (2508 of 3214 strings)

[CI skip]
 2016-02-08 16:43:38 +01:00
Giovanni Sora
2f9edad6b7 Translated using Weblate (Interlingua) 
Currently translated at 72.6% (2335 of 3214 strings)

[CI skip]
 2016-02-08 16:43:38 +01:00
Marc-Antoine Thevenet
73368e276b Translated using Weblate (French) 
Currently translated at 99.9% (3213 of 3214 strings)

[CI skip]
 2016-02-08 16:43:37 +01:00
dingo thirteen
53b65d88b4 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:43:37 +01:00
Michal Čihař
ac25772f3a Merge branch 'QA_4_6' 2016-02-08 16:43:19 +01:00
Michal Čihař
a501b8f012 Merge commit '9a22f5af69635501de745dc3eeae1e5644415d4a' 2016-02-08 16:43:15 +01:00
Michal Čihař
29edefae02 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_6 2016-02-08 16:42:51 +01:00
Atul Pratap Singh
9dfd1ea2d6 Merge branch 'QA_4_5' 2016-02-08 21:09:14 +05:30
Atul Pratap Singh
5a00545bf8 Add missing teardown 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-08 21:06:53 +05:30
Atul Pratap Singh
9b3a037ff4 changelog entry 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-02-08 20:58:37 +05:30
Weblate
d156e8b179 Merge remote-tracking branch 'origin/master' 2016-02-08 16:25:10 +01:00
Burak Yavuz
ff3d43c4c8 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:25:10 +01:00
Domen
24336e7ed4 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:25:09 +01:00
Seongki Shin
af8b11debd Translated using Weblate (Korean) 
Currently translated at 78.0% (2508 of 3214 strings)

[CI skip]
 2016-02-08 16:25:08 +01:00
Giovanni Sora
db7ea7019c Translated using Weblate (Interlingua) 
Currently translated at 72.6% (2335 of 3214 strings)

[CI skip]
 2016-02-08 16:25:07 +01:00
Marc-Antoine Thevenet
a2872fba51 Translated using Weblate (French) 
Currently translated at 99.9% (3213 of 3214 strings)

[CI skip]
 2016-02-08 16:25:06 +01:00
Kristjan Räts
8416202511 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 16:25:06 +01:00
dingo thirteen
e2a3408cc7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-02-08 16:25:05 +01:00
Atul Pratap Singh
74bdd57ecc Merge branch 'QA_4_5' 2016-02-08 20:54:29 +05:30
Atul Pratap Singh
aeb69d3fed Merge pull request #11926 from 007durgesh219/Issue#11906 
Fix Loading... banner shows on login screen, Issue #11906
 2016-02-08 20:48:35 +05:30
Kristjan Räts
9a22f5af69 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 14:54:57 +01:00
Domen
f940258e64 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 14:35:36 +01:00
Burak Yavuz
97a9a8bbd8 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3214 of 3214 strings)

[CI skip]
 2016-02-08 12:25:19 +01:00
Durgesh
59fd4e0efc Fix Loading... banner shows on login screen, Issue #11906 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-08 16:37:30 +05:30
Bilal Amarni
3d9095c326 [doc] Installation with Composer - add --no-dev option 
Otherwise it installs multiple dependencies not needed for
running PhpMyAdmin (phpunit, code sniffer, etc.).

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
 2016-02-08 11:51:08 +01:00
Weblate
bd47943cc5 Merge remote-tracking branch 'origin/master' 2016-02-08 11:08:35 +01:00
Kristjan Räts
d880f6c6ec Translated using Weblate (Estonian) 
Currently translated at 99.9% (3212 of 3214 strings)

[CI skip]
 2016-02-08 11:08:31 +01:00
Weblate
65bfc602df Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-08 11:08:30 +01:00
Kristjan Räts
b1174f0b08 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3212 of 3214 strings)

[CI skip]
 2016-02-08 11:08:29 +01:00