gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,781 Commits 12 Branches 481 Tags 2.4 GiB
2423aac692
Commit Graph

108781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2423aac692 Merge branch 'QA_4_7' 2017-02-02 13:43:55 +01:00
Michal Čihař
5022ff9560 Do not show errors from OpenSSL cookie encryption/decryption 
This can happen from corrupted cookies, by invalid encryption parameters
used in older phpMyAdmin versions or by wrong openSSL configuration.

In neither case the error is useful to user, but we need to clear the
error buffer as otherwise the errors would pop up later, for example
during MySQL SSL setup.

Fixes #12924

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 13:43:51 +01:00
Michal Čihař
b55ff27f16 Pass correct parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 13:25:26 +01:00
Michal Čihař
648f5beb7b Merge branch 'QA_4_7' 2017-02-02 13:21:56 +01:00
Michal Čihař
c0bb9520e9 Allow to export JSON with unescaped unicode chars 
This is optional as there are some parsers which have problems with
utf-8, see http://stackoverflow.com/q/4901133/225718

Fixes #12946

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-02 13:21:06 +01:00
Marc Delisle
8c102dc875 Translated using Weblate (French) 
Currently translated at 99.2% (3175 of 3199 strings)

[CI skip]
 2017-02-02 13:20:53 +01:00
Marc Delisle
8a5531a05a Translated using Weblate (French) 
Currently translated at 99.2% (3175 of 3199 strings)

[CI skip]
 2017-02-02 13:20:29 +01:00
Burak Yavuz
98ad19576a Translated using Weblate (Turkish) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-01 12:46:32 +01:00
Weblate
97a41c8158 Merge remote-tracking branch 'origin/master' 2017-02-01 02:50:30 +01:00
Burak Yavuz
69a01f5423 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-01 02:50:30 +01:00
Παναγιώτης Παπάζογλου
345107d63e Translated using Weblate (Greek) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-02-01 02:50:27 +01:00
Isaac Bennetch
70d380e83d Update documentation link for PHP site (was a redirect) 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-31 20:49:53 -05:00
Kristjan Räts
baad5fdbbe Translated using Weblate (Estonian) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-01-31 15:44:43 +01:00
Παναγιώτης Παπάζογλου
281dd5b021 Translated using Weblate (Greek) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-01-30 01:45:23 +01:00
Kristjan Räts
46e727649c Translated using Weblate (Estonian) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-01-29 13:13:57 +01:00
Isaac Bennetch
16eef4c103 Merge branch 'QA_4_7' 2017-01-28 23:14:44 -05:00
Isaac Bennetch
5514037b4f Merge commit 'de7b725' 2017-01-28 23:14:06 -05:00
Isaac Bennetch
470194f0d6 Merge commit 'b853299' 2017-01-28 23:11:48 -05:00
Isaac Bennetch
68a416d525 Merge commit 'e1a65ba' 2017-01-28 23:11:34 -05:00
Isaac Bennetch
7b4068da7d Fix undefined index warning with some SSL connections and ssl_ca_paths. 
Fixes #12929

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-28 23:06:46 -05:00
Weblate
d3af64d4ef Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-01-29 04:40:14 +01:00
Domen
de7b725f75 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-01-29 04:40:13 +01:00
Diogo Millnitz
210c078bae Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.5% (2992 of 3199 strings)

[CI skip]
 2017-01-29 04:40:12 +01:00
Jarosław Pietras
1ce11ceb35 Translated using Weblate (Polish) 
Currently translated at 82.3% (2634 of 3199 strings)

[CI skip]
 2017-01-29 04:40:12 +01:00
Weblate
3ad95ce663 Merge remote-tracking branch 'origin/master' 2017-01-29 04:40:07 +01:00
Domen
444c576617 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-01-29 04:40:06 +01:00
Diogo Millnitz
1db9927fa7 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.5% (2992 of 3199 strings)

[CI skip]
 2017-01-29 04:40:05 +01:00
Jarosław Pietras
2b921a45ca Translated using Weblate (Polish) 
Currently translated at 82.3% (2634 of 3199 strings)

[CI skip]
 2017-01-29 04:40:04 +01:00
Isaac Bennetch
b853299cba Add closelog() call after writing to syslog. 
See http://php.net/manual/en/function.syslog.php#79554
and our issue #6146

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-28 22:39:51 -05:00
Isaac Bennetch
9713648d70 Add closelog() call after writing to syslog. 
See http://php.net/manual/en/function.syslog.php#79554
and our issue #6146

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-28 22:39:31 -05:00
Vitaliy Perekupka
e1a65ba30c Translated using Weblate (Ukrainian) 
Currently translated at 79.9% (2559 of 3199 strings)

[CI skip]
 2017-01-28 18:46:39 +01:00
Vitaliy Perekupka
1fc8648686 Translated using Weblate (Ukrainian) 
Currently translated at 79.9% (2559 of 3199 strings)

[CI skip]
 2017-01-28 18:46:33 +01:00
dingo thirteen
df64a9ef68 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-01-26 21:38:05 +01:00
dingo thirteen
1e497f4d9e Translated using Weblate (Dutch) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-01-26 21:37:57 +01:00
Michal Čihař
522a3a2b72 Merge branch 'QA_4_7' 2017-01-26 08:40:05 +01:00
Michal Čihař
e93741caba Adjust Weblate configuration for 4.7 branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-26 08:39:07 +01:00
Isaac Bennetch
2a989a23bb Prepare for 4.8.0-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-25 23:12:48 -05:00
Isaac Bennetch
62c6e73cc5 Prepare for 4.7.0-beta1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-25 19:25:29 -05:00
Burak Yavuz
5fbd21a0bd Translated using Weblate (Turkish) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-01-25 16:26:12 +01:00
Weblate
3e88d0a3b2 Merge remote-tracking branch 'origin/master' 2017-01-25 14:02:35 +01:00
Vitaliy Perekupka
653167c330 Translated using Weblate (Ukrainian) 
Currently translated at 79.9% (2557 of 3199 strings)

[CI skip]
 2017-01-25 14:02:34 +01:00
Michal Čihař
aa1c65a2c4 Merge pull request #12836 from nijel/source-release 
Add source release, strip current ones
 2017-01-25 14:02:25 +01:00
Domen
a001b54896 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
 2017-01-25 13:21:17 +01:00
Michal Čihař
5aecdb84b0 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-25 10:08:28 +01:00
Michal Čihař
fe39fbfe1a Merge branch 'QA_4_6' 2017-01-25 10:07:33 +01:00
Michal Čihař
00dfda33e7 Merge remote-tracking branch 'origin/QA_4_6' 2017-01-25 10:07:30 +01:00
Michal Čihař
31084a09f6 Improve error message for cookie encryption 
- make it localized
- correctly report that it's about cookies

Issue #12924

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-25 10:07:19 +01:00
Weblate
e3709cfb66 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-25 10:03:30 +01:00
Michal Čihař
9e4ed48c86 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.6% (3053 of 3226 strings)

[CI skip]
 2017-01-25 10:03:30 +01:00
Michal Čihař
815cae35d2 Translated using Weblate (Polish) 
Currently translated at 82.8% (2672 of 3226 strings)

[CI skip]
 2017-01-25 10:03:29 +01:00