gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,384 Commits 12 Branches 481 Tags 2.4 GiB
0042e169c2
Commit Graph

110384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
0042e169c2 Merge commit '0b5063999da43ec41f77d809251bc9031dec71d4' 2017-07-21 11:45:37 +02:00
Michal Čihař
079b87a1ea Merge commit '3bb0e0bdc3d72c6aea6a6efa9e4dc2361a508b54' 2017-07-21 11:44:47 +02:00
Michal Čihař
b08a868efe Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-07-21 11:44:02 +02:00
Bo Anderson
41f132ca77 Translated using Weblate (English (United Kingdom)) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-21 01:47:40 +02:00
Isaac Bennetch
0b5063999d Prepare for 4.7.4-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-20 16:39:27 -04:00
Isaac Bennetch
2483774e86 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-20 15:30:55 -04:00
Isaac Bennetch
d66590b3fa Adding composer lock for 4.7.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-20 14:35:47 -04:00
Isaac Bennetch
633b5e72ad Prepare for release 4.7.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-07-20 14:32:10 -04:00
Vladimir G
3bb0e0bdc3 Translated using Weblate (Russian) 
Currently translated at 94.4% (3026 of 3205 strings)

[CI skip]
 2017-07-20 18:46:22 +02:00
Weblate
359452095a Merge remote-tracking branch 'origin/master' 2017-07-20 18:30:52 +02:00
zhangmiao
073df103e2 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 85.7% (2754 of 3213 strings)

[CI skip]
 2017-07-20 18:30:48 +02:00
Maurício Meneghini Fauth
2ff3920438 Merge pull request #13508 from mauriciofauth/classes 
Move classes to PhpMyAdmin namespace
 2017-07-20 13:30:39 -03:00
Maurício Meneghini Fauth
85866598e5 Move Twig classes to PhpMyAdmin namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-20 12:19:48 -03:00
Maurício Meneghini Fauth
6e53b22991 Move properties classes to PhpMyAdmin namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-20 12:08:58 -03:00
Maurício Meneghini Fauth
2631bcedba Move plugins classes to PhpMyAdmin namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-20 11:50:12 -03:00
Maurício Meneghini Fauth
67753d579c Fix class not found 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-20 09:37:39 -03:00
Erik V
76d5b49508 Translated using Weblate (German) 
Currently translated at 99.9% (3203 of 3205 strings)

[CI skip]
 2017-07-20 12:45:18 +02:00
Maurício Meneghini Fauth
160086d452 Merge pull request #13506 from mauriciofauth/classes 
Move navigation classes to PhpMyAdmin namespace
 2017-07-20 00:37:41 -03:00
Maurício Meneghini Fauth
dc1407ca66 Move navigation classes to PhpMyAdmin namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-19 21:52:26 -03:00
Burak Yavuz
efeda3d386 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-19 21:46:57 +02:00
Domen
19669c9692 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3205 of 3205 strings)

[CI skip]
 2017-07-19 21:46:32 +02:00
Giovanni Sora
cd1b943f19 Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2422 of 3205 strings)

[CI skip]
 2017-07-19 18:45:43 +02:00
Weblate
72161e8107 Merge remote-tracking branch 'origin/master' 2017-07-19 17:34:26 +02:00
Vladimir G
5b9ad5ee04 Translated using Weblate (Russian) 
Currently translated at 93.8% (3015 of 3213 strings)

[CI skip]
 2017-07-19 17:34:25 +02:00
Erik V
17f5524190 Translated using Weblate (German) 
Currently translated at 99.8% (3209 of 3213 strings)

[CI skip]
 2017-07-19 17:34:22 +02:00
Maurício Meneghini Fauth
c83c82f3b5 Merge pull request #13504 from mauriciofauth/classes 
Move GIS classes to PhpMyAdmin namespace
 2017-07-19 12:34:13 -03:00
Maurício Meneghini Fauth
13006d735c Move GIS classes to PhpMyAdmin namespace 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-07-18 23:09:26 -03:00
Domen
3de772ea5a Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-18 21:30:11 +02:00
Burak Yavuz
982e6180b1 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]
 2017-07-18 19:37:49 +02:00
Michal Čihař
41b045f130 Show warning in case user can only display privileges 
Fixes #13442

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 14:55:24 +02:00
Michal Čihař
54466d68c6 Use Message to avoid need to specify namespace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 14:55:24 +02:00
Weblate
5db9a3eed2 Merge remote-tracking branch 'origin/master' 2017-07-18 14:21:19 +02:00
Giovanni Sora
7d90ecfe4f Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2426 of 3213 strings)

[CI skip]
 2017-07-18 14:21:16 +02:00
Michal Čihař
0da9acc657 Merge branch 'QA_4_7' 2017-07-18 14:20:33 +02:00
Michal Čihař
b7788850a9 Fixed usage of some browser transformations 
Fixes #13478

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 14:18:02 +02:00
Michal Čihař
300cc8b8b2 Factor out code for MIME tranformations mapping 
Issue #1347

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 14:07:55 +02:00
Michal Čihař
632eea08fa Merge branch 'QA_4_7' 2017-07-18 13:32:41 +02:00
Michal Čihař
3ff7cf52e7 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:32:14 +02:00
Michal Čihař
5d9056367c Fix path to Config.php in master 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:31:50 +02:00
Michal Čihař
8dd0381043 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:29:19 +02:00
Michal Čihař
7cc0ae9acb Merge branch 'QA_4_7' 2017-07-18 13:28:11 +02:00
Michal Čihař
b2a902de4d Switch to SSL connection if server tells us to do so 
Fixes #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:26:35 +02:00
Michal Čihař
471b341d2e Allow SSL connection even when the certs are not set 
Issue #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 13:00:06 +02:00
Michal Čihař
7244330aa0 Add missing server version definition 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 12:36:57 +02:00
Michal Čihař
85f5fd4bd6 Merge branch 'QA_4_7' 2017-07-18 12:05:42 +02:00
Michal Čihař
b2b3886e22 Fail if ini_set/ini_get are disabled 
We might support operation without these two later, but it's quite a lot
of work and nobody was really requesting this.

Fixes #13471

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 12:04:38 +02:00
Michal Čihař
d15da74eda Merge branch 'QA_4_7' 2017-07-18 12:00:02 +02:00
Michal Čihař
6e7c6aed7d Avoid breakage if set_time_limit is disabled 
Fixs #13468

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 11:57:59 +02:00
Michal Čihař
9eb7287b72 Merge branch 'QA_4_7' 2017-07-18 11:47:02 +02:00
Michal Čihař
4b4403aeef Update to current lint plugin 
Our patch has been integrated.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-18 11:46:43 +02:00