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

109029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Сергій Педько
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ř
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
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
Michal Čihař
44709c0131 Changelog entry for #12983 and #13011 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 16:33:11 +01:00
Michal Čihař
1f819d8d50 Coding style improvements to #13011 
- use camel case for function names
- move initialization to existing on load block

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 16:32:01 +01:00
Michal Čihař
a280edc69f Merge remote-tracking branch 'origin/pull/13011' 2017-02-20 16:29:36 +01:00
Michal Čihař
56297ffecc Remove token from GET request while changing theme 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 10:17:52 +01:00
Michal Čihař
5ad0c08868 Merge branch 'QA_4_7' 2017-02-20 10:08:18 +01:00
Michal Čihař
ab6e961c34 Show user errors even if normal errors are suppressed 
I'm not sure we're hitting this case somewhere, but it makes sense to
get this fixed.

Issue #13021

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 10:07:41 +01:00
Michal Čihař
a9ddb39aac Show phpMyAdmin errors even with error_reporting set to 0 
Fixes #13021

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 10:04:38 +01:00
Michal Čihař
8cc6de4de3 Remove ServerLibraryDifference_DisableWarning setting 
This is getting more and more problematic these days as most of Linux
distributions ship MariaDB libraries, while many people run MySQL
servers. As MariaDB claims the protocol compatibility should stay, we
should not warn in this case.

Of course there is option to add this exception to the warning (so far
the exception is there only other way - when using MySQL libraries to
connect to MariaDB server), but we would be ignoring most cases already
and I think complete removal is better than adding exceptions.

Overall I don't think this warning is doing any good these days.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-20 09:19:22 +01:00
Michal Čihař
7e1be7bd36 Merge branch 'QA_4_7' 2017-02-20 09:08:12 +01:00
Joshua Atkins
53eff5d47b Align NULL values according to column alignment 
Fixes #13000.

Signed-off-by: Joshua Atkins <support@jublo.net>
 2017-02-20 09:06:36 +01:00
Mike Lewis
dcaeb652b0 Also submit inline SQL form when pressing the command key on macOS 
Allows for the natural macOS key combination to submit a form (command
+ enter) to be used in addition to the Windows combination (control +
enter)

Signed-off-by: Mike Lewis <mike@mplew.is>
 2017-02-20 09:03:40 +01:00
Michal Čihař
72572cb6c2 Merge branch 'QA_4_7' 2017-02-20 08:58:35 +01:00