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

108766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stefano Martinelli
fd6eb0a938 Translated using Weblate (Italian) 
Currently translated at 100.0% (3226 of 3226 strings)

[CI skip]
 2017-01-25 10:03:28 +01:00
Παναγιώτης Παπάζογλου
aac4cb1c55 Translated using Weblate (Greek) 
Currently translated at 100.0% (3226 of 3226 strings)

[CI skip]
 2017-01-25 10:03:28 +01:00
Michal Čihař
f6c2786491 Translated using Weblate (Dutch) 
Currently translated at 99.9% (3225 of 3226 strings)

[CI skip]
 2017-01-25 10:03:27 +01:00
Michal Čihař
625b3c7d09 Translated using Weblate (Czech) 
Currently translated at 93.8% (3027 of 3226 strings)

[CI skip]
 2017-01-25 10:03:27 +01:00
Weblate
92aec6922a Merge remote-tracking branch 'origin/master' 2017-01-25 10:03:23 +01:00
Michal Čihař
707accc2f9 Translated using Weblate (Czech) 
Currently translated at 93.7% (2997 of 3198 strings)

[CI skip]
 2017-01-25 10:03:20 +01:00
Michal Čihař
c18d2a9ced Changelog entry for #12923 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-25 10:03:08 +01:00
Michal Čihař
23af64dbeb Merge branch 'QA_4_6' 2017-01-25 10:02:31 +01:00
Michal Čihař
20a5e25fe0 Fix navigation panel server side search 
Fixes #12923

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-25 10:01:16 +01:00
Michal Čihař
6b85f6f857 Clarify documentation on limits 
- mention max_execution_time
- correctly state that post limit has to be bigger than uploaded file one

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-24 11:03:05 +01:00
Weblate
8eeef007ed Merge remote-tracking branch 'origin/master' 2017-01-24 09:51:44 +01:00
Giovanni Sora
c39ed57ab4 Translated using Weblate (Interlingua) 
Currently translated at 75.7% (2424 of 3198 strings)

[CI skip]
 2017-01-24 09:51:43 +01:00
Michal Čihař
d6b198e3fa Merge branch 'QA_4_6' 2017-01-24 09:51:25 +01:00
Michal Čihař
476649fbdc Merge commit 'c812bcd4112c3d44e6e6bc72e710b9935c6aa9d3' 2017-01-24 09:51:01 +01:00
Michal Čihař
fa7f9f6940 Merge commit '3087a889567ecf547ac98f6c7668c67a1153f3af' 2017-01-24 09:50:06 +01:00