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

109806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2da1ebc4a8 Merge branch 'QA_4_7' 2017-06-06 09:54:04 +02:00
Володимир Бриняк
f4a02e644d Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-06-06 09:53:37 +02:00
Viktar Vauchkevich
a3645b50c3 Translated using Weblate (Belarusian) 
Currently translated at 58.6% (1876 of 3198 strings)

[CI skip]
 2017-06-06 09:53:34 +02:00
Michal Čihař
40577052fe Add reference to configuration option 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-06 09:53:28 +02:00
Володимир Бриняк
09eca334f0 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-06-06 09:53:19 +02:00
Viktar Vauchkevich
e451d0cfd0 Translated using Weblate (Belarusian) 
Currently translated at 58.6% (1882 of 3207 strings)

[CI skip]
 2017-06-06 09:53:14 +02:00
Renan Dias
e27dc1854a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.6% (2994 of 3198 strings)

[CI skip]
 2017-06-06 03:46:11 +02:00
Renan Dias
284e450128 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2987 of 3207 strings)

[CI skip]
 2017-06-06 03:46:04 +02:00
Dovydas
211f251d7b Translated using Weblate (Lithuanian) 
Currently translated at 41.8% (1337 of 3198 strings)

[CI skip]
 2017-06-05 15:45:44 +02:00
Dovydas
4694f19581 Translated using Weblate (Lithuanian) 
Currently translated at 41.5% (1333 of 3207 strings)

[CI skip]
 2017-06-05 15:45:38 +02:00
Stanisław Krukowski
3125ed334f Translated using Weblate (Polish) 
Currently translated at 81.2% (2598 of 3198 strings)

[CI skip]
 2017-06-05 12:46:13 +02:00
Stanisław Krukowski
240b088405 Translated using Weblate (Polish) 
Currently translated at 80.8% (2592 of 3207 strings)

[CI skip]
 2017-06-05 12:46:07 +02:00
某玩家
df0f07e212 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 98.3% (3145 of 3198 strings)

[CI skip]
 2017-06-05 12:44:29 +02:00
某玩家
7ac52e87e8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 97.9% (3142 of 3207 strings)

[CI skip]
 2017-06-05 12:44:23 +02:00
Viktar Vauchkevich
3695a1a6b2 Translated using Weblate (Belarusian) 
Currently translated at 57.5% (1840 of 3198 strings)

[CI skip]
 2017-06-04 21:44:19 +02:00
Viktar Vauchkevich
cd9948aead Translated using Weblate (Belarusian) 
Currently translated at 57.5% (1846 of 3207 strings)

[CI skip]
 2017-06-04 21:44:13 +02:00
Володимир Бриняк
2c318e0878 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-06-04 09:52:24 +02:00
Володимир Бриняк
e3232c5542 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3198 of 3198 strings)

[CI skip]
 2017-06-04 09:51:45 +02:00
Justas Vilimas
c6513b8548 Translated using Weblate (Lithuanian) 
Currently translated at 41.8% (1337 of 3198 strings)

[CI skip]
 2017-06-03 14:48:59 +02:00
Dovydas
f61a175bbc Translated using Weblate (Lithuanian) 
Currently translated at 41.7% (1336 of 3198 strings)

[CI skip]
 2017-06-03 14:43:46 +02:00
Justas Vilimas
98d5640e72 Translated using Weblate (Lithuanian) 
Currently translated at 41.5% (1331 of 3207 strings)

[CI skip]
 2017-06-03 14:42:42 +02:00
Justas Vilimas
e21c364517 Translated using Weblate (Lithuanian) 
Currently translated at 41.7% (1335 of 3198 strings)

[CI skip]
 2017-06-03 14:40:12 +02:00
Dovydas
369e503db4 Translated using Weblate (Lithuanian) 
Currently translated at 41.4% (1330 of 3207 strings)

[CI skip]
 2017-06-03 14:40:06 +02:00
Dovydas
295702aba8 Translated using Weblate (Lithuanian) 
Currently translated at 41.7% (1334 of 3198 strings)

[CI skip]
 2017-06-03 14:36:55 +02:00
Michal Čihař
2af08b93f1 Merge branch 'QA_4_7' 2017-06-02 18:04:39 +02:00
Michal Čihař
833223654a Fixed direct login for accounts without password 
Fixes #13311

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 18:04:27 +02:00
Michal Čihař
fe3f8ce0ea Merge branch 'QA_4_7' 2017-06-02 18:02:18 +02:00
Michal Čihař
d1075ecb1a Pass common parameters when changing theme 
This avoids reseting server setting.

Fixes #13314

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 18:01:39 +02:00
Michal Čihař
84309d62bd Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 17:47:29 +02:00
Michal Čihař
1cc39df414 Make Message_notice display the message 
Fixes #13349

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 17:38:59 +02:00
Michal Čihař
57f250af62 Simplify hint display 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 17:38:59 +02:00
Michal Čihař
0c1589920e Merge pull request #13341 from mauriciofauth/sql-lib 
Refactor the sql functions into static methods
 2017-06-02 17:25:24 +02:00
Michal Čihař
87fd00915a Remove composer.lock after tagging release 
We really want this file only on tags and not elsewhere.

Fixes #13346

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 09:53:05 +02:00
Michal Čihař
c4380018a7 Avoid .gitignore modification when commiting composer.lock 
With --force we can add files which would be ignored.

Issue #13346

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 09:51:36 +02:00
Michal Čihař
bbf5ca9156 Merge branch 'QA_4_7' 2017-06-02 09:50:57 +02:00
Michal Čihař
695464de8a Ignore composer.lock from git 
Issue #13346

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 09:50:47 +02:00
Michal Čihař
b2ddd0c14a Merge branch 'QA_4_7' 2017-06-02 09:35:40 +02:00
Michal Čihař
9748c35b76 Merge remote-tracking branch 'origin/QA_4_7' 2017-06-02 09:35:38 +02:00
Michal Čihař
d2240cd8f2 Fix phpseclib method invocation 
Apparently this has been broken for quite some time on PHP 5 and nobody
noticed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 09:35:24 +02:00
Michal Čihař
e23d174942 Specify -e parameter to sed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-02 09:34:53 +02:00
Viktar Vauchkevich
1512bd3f15 Translated using Weblate (Belarusian) 
Currently translated at 56.9% (1820 of 3198 strings)

[CI skip]
 2017-06-02 09:34:37 +02:00
Weblate
a12a41e73a Merge remote-tracking branch 'origin/master' 2017-06-02 04:42:21 +02:00
Viktar Vauchkevich
c90557234b Translated using Weblate (Belarusian) 
Currently translated at 56.9% (1826 of 3207 strings)

[CI skip]
 2017-06-02 04:42:16 +02:00
Isaac Bennetch
a9626ecd31 Slight improvement to phrasing 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-06-01 22:39:39 -04:00
Maurício Meneghini Fauth
7fd6718e83 Merge branch 'master' into sql-lib 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-01 11:12:59 -03:00
Michal Čihař
69e50a8886 Merge pull request #13329 from karlvaniseghem/twig-auto-escape 
Removed &nbsp;&nbsp;
 2017-06-01 15:38:28 +02:00
Michal Čihař
2c51cb4271 Document how to customize themes in Docker image 
Fixes https://github.com/phpmyadmin/docker/issues/37

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 15:30:15 +02:00
Michal Čihař
0893c067a7 Merge branch 'QA_4_7' 2017-06-01 15:18:39 +02:00
Michal Čihař
e10a7fd5d4 Increase memory limit for OSX tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 15:18:26 +02:00
Michal Čihař
90a6678500 Merge branch 'QA_4_7' 2017-06-01 15:16:16 +02:00