Commit Graph

109041 Commits

Author SHA1 Message Date
tmtisfree
4f10087779 Translated using Weblate (French)
Currently translated at 99.9% (3192 of 3193 strings)

[CI skip]
2017-02-22 09:56:55 +01:00
Weblate
563fdffa12 Merge remote-tracking branch 'origin/master' 2017-02-22 09:51:41 +01:00
Володимир
8f48787c93 Translated using Weblate (Ukrainian)
Currently translated at 80.0% (2555 of 3193 strings)

[CI skip]
2017-02-22 09:51:40 +01:00
tmtisfree
ef5bfff2da Translated using Weblate (French)
Currently translated at 99.9% (3192 of 3193 strings)

[CI skip]
2017-02-22 09:51:37 +01:00
Michal Čihař
913bfe3c79 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-02-22 09:51:24 +01:00
Michal Čihař
74c860489c Merge branch 'QA_4_7' 2017-02-22 09:50:59 +01:00
Michal Čihař
8ea5ea351b Document bugfix
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 09:50:52 +01:00
Michal Čihař
cddbb01a2b Do not ask CURL to return headers when we're sending one
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 09:48:12 +01:00
Сергій Педько
d802aaa9b4 Translated using Weblate (Ukrainian)
Currently translated at 80.0% (2556 of 3193 strings)

[CI skip]
2017-02-22 09:45:58 +01:00
Володимир
7171cf6821 Translated using Weblate (Ukrainian)
Currently translated at 79.9% (2553 of 3193 strings)

[CI skip]
2017-02-22 09:36:38 +01:00
Michal Čihař
1d08dd281b Pass correct headers to httpRequest
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 09:22:04 +01:00
Michal Čihař
0f1f046488 Wrap long line
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 09:22:04 +01:00
Michal Čihař
acb7438883 Merge pull request #13025 from ibennetch/comments-qa
Hide comment field when no table comment is set
2017-02-22 09:07:26 +01:00
Michal Čihař
547cd42b53 Merge branch 'QA_4_7' 2017-02-22 09:00:06 +01:00
Michal Čihař
33f43e741d Remove obsolete strings from po file
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 08:59:36 +01:00
Michal Čihař
a0759adf2a Update po files
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 08:57:34 +01:00
Michal Čihař
1922db4ef1 Merge branch 'QA_4_7' 2017-02-22 08:57:12 +01:00
Michal Čihař
2767621bfa Update po files
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 08:56:56 +01:00
Weblate
67a5dda2a3 Merge remote-tracking branch 'origin/master' 2017-02-22 08:55:45 +01:00
Володимир
86fec69942 Translated using Weblate (Ukrainian)
Currently translated at 79.9% (2557 of 3199 strings)

[CI skip]
2017-02-22 08:55:44 +01:00
Weblate
a268c2a4b3 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-22 08:55:41 +01:00
tmtisfree
e30eb03c82 Translated using Weblate (French)
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
2017-02-22 08:55:41 +01:00
Володимир
8e12ea58c3 Translated using Weblate (Ukrainian)
Currently translated at 79.9% (2557 of 3199 strings)

[CI skip]
2017-02-22 08:55:40 +01:00
tmtisfree
8c4f4579ba Translated using Weblate (French)
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
2017-02-22 08:55:38 +01:00
Michal Čihař
67fbacc642 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-02-22 08:55:21 +01:00
Michal Čihař
28dc8a4b68 Merge branch 'QA_4_7' 2017-02-22 08:55:13 +01:00
Michal Čihař
999a58609f Error is always instance of Error class
We rely on this in other places in ErrorHandler as well, there is no
reason for this place to be different.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 08:52:03 +01:00
Michal Čihař
1a4c5e4e8f Remove commented out code
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 08:51:16 +01:00
Michal Čihař
f8edf0376b This really should not happen
The configuration defaults are applied globally. In case this
does happen again, it should be properly investigated.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-22 08:48:38 +01:00
Isaac Bennetch
b50b97af49 Hide comment field on table Structure tab when no comment is set
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2017-02-21 21:36:52 -05:00
tmtisfree
46b088d444 Translated using Weblate (French)
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
2017-02-21 21:10:44 +01:00
tmtisfree
be3da02e9a Translated using Weblate (French)
Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]
2017-02-21 21:10:33 +01:00
Weblate
95bd933362 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-21 14:37:15 +01:00
Володимир
1c85cb44c7 Translated using Weblate (Ukrainian)
Currently translated at 79.7% (2552 of 3199 strings)

[CI skip]
2017-02-21 14:37:15 +01:00
Weblate
222c10c19d Merge remote-tracking branch 'origin/master' 2017-02-21 14:37:12 +01:00
Володимир
12eceef08c Translated using Weblate (Ukrainian)
Currently translated at 79.7% (2552 of 3199 strings)

[CI skip]
2017-02-21 14:37:11 +01:00
Michal Čihař
9d0015dd25 Merge branch 'QA_4_7' 2017-02-21 14:36:55 +01:00
Michal Čihař
f6d594d952 Merge remote-tracking branch 'origin/QA_4_7' 2017-02-21 14:36:53 +01:00
Michal Čihař
1c8c264b08 Remove buildtimetrend as public service has been discontinued
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-21 14:36:41 +01:00
Michal Čihař
e3f9023488 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-02-21 09:21:27 +01:00
Michal Čihař
a0843518eb Changelog entry for #12315 and #12952
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-21 09:20:52 +01:00
Michal Čihař
2e53b7189f Merge remote-tracking branch 'origin/pull/12952' into tmp 2017-02-21 09:18:48 +01:00
Weblate
fa7093271c Merge remote-tracking branch 'origin/master' 2017-02-21 09:14:20 +01:00
Володимир
afc76e7053 Translated using Weblate (Ukrainian)
Currently translated at 80.0% (2560 of 3199 strings)

[CI skip]
2017-02-21 09:14:19 +01:00
Weblate
7cb87f5547 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-21 09:14:18 +01:00
Володимир
463ca96cb3 Translated using Weblate (Ukrainian)
Currently translated at 80.0% (2560 of 3199 strings)

[CI skip]
2017-02-21 09:14:18 +01:00
Michal Čihař
cd37ee07e2 Merge branch 'QA_4_7' 2017-02-21 09:13:48 +01:00
Michal Čihař
510d7ab8ca Changelog entry for issue #13020
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-21 09:13:18 +01:00
Michal Čihař
bb762f8bb5 Merge pull request #13020 from nijel/mysql-warning
Remove ServerLibraryDifference_DisableWarning setting
2017-02-21 09:12:15 +01:00
Cristiano Lancelotti
04c8ce1f5f filling all chart
Signed-off-by: Cristiano Lancelotti <lancelot.info@gmail.com>
2017-02-21 04:39:02 -03:00