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

109782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
371a2433a5 Remove tests on ancient hhvm 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 15:15:59 +02:00
Michal Čihař
beaaed511e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-06-01 14:53:13 +02:00
Michal Čihař
ad7b9eee59 Ignore twig templates 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:46:50 +02:00
Michal Čihař
a3293b12a3 Merge pull request #13284 from udan11/fix_13269 
Small refactoring in preparation to CSP.
 2017-06-01 14:43:17 +02:00
Michal Čihař
8aa4ca5985 Merge branch 'QA_4_7' 2017-06-01 14:42:35 +02:00
Michal Čihař
073a26b0da Use Util::generateRandom for generating CSRF token 
- We reuse existing code for that.
- The token string is now shorter as it can contain any ASCII char,
  compared to hex digits previously.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:40:26 +02:00
Weblate
e7a6eadcee Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-01 14:36:05 +02:00
Володимир Бриняк
54c5a80263 Translated using Weblate (Ukrainian) 
Currently translated at 99.9% (3197 of 3198 strings)

[CI skip]
 2017-06-01 14:36:04 +02:00
davipatury
edfa111b9e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.4% (2958 of 3198 strings)

[CI skip]
 2017-06-01 14:36:03 +02:00
Rajat Sharma
b18323b210 Translated using Weblate (Hindi) 
Currently translated at 36.8% (1178 of 3198 strings)

[CI skip]
 2017-06-01 14:36:02 +02:00
Viktar Vauchkevich
790283cccc Translated using Weblate (Belarusian) 
Currently translated at 55.9% (1790 of 3198 strings)

[CI skip]
 2017-06-01 14:36:00 +02:00
Michal Čihař
71c3f9f7c1 Fix check for phpseclib presence 
The check here was reversed compared to other locations.

Fixes #13308

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:33:03 +02:00
Michal Čihař
3eb07713fe Merge branch 'QA_4_7' 2017-06-01 14:32:01 +02:00
Michal Čihař
a09ce3c76d Merge commit 'd09bba5bb6b10ca90c366851e45dec2480791f5d' 2017-06-01 14:31:54 +02:00
Michal Čihař
82933cc68d Merge commit 'a39992be43780f2a58709da56e5d41b666b8aa3b' 2017-06-01 14:31:26 +02:00
Michal Čihař
aa18cf7c90 Remove composer lock from branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:30:14 +02:00
Michal Čihař
a586c8ca4f Ensure we reset locales back to English after running tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:29:08 +02:00
Michal Čihař
b368c38357 Move random string generation to separate method 
It's better to reuse the code in more locations.

See #13308

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:28:26 +02:00
Michal Čihař
6b18dfa588 Improve secret generation 
Strip highest bit so that we can use more generated bytes in the ASCII
password.

See #13308

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-01 14:12:57 +02:00
Michal Čihař
a07ee72499 Merge pull request #13333 from mauriciofauth/templates 
Port some templates to Twig
 2017-06-01 14:00:04 +02:00
Weblate
8fa57d23ff Merge remote-tracking branch 'origin/master' 2017-06-01 13:58:21 +02:00
Володимир Бриняк
bff42f0338 Translated using Weblate (Ukrainian) 
Currently translated at 99.9% (3206 of 3207 strings)

[CI skip]
 2017-06-01 13:58:20 +02:00
davipatury
d1b28bd1f3 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.0% (2951 of 3207 strings)

[CI skip]
 2017-06-01 13:58:19 +02:00
Rajat Sharma
ad2f03b9cd Translated using Weblate (Hindi) 
Currently translated at 36.6% (1174 of 3207 strings)

[CI skip]
 2017-06-01 13:58:18 +02:00