Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 6ef0943541e03be4283cb3b60dd1e8a3b0f07124
https://github.com/phpmyadmin/phpmyadmin/commit/6ef0943541e03be4283cb3b60dd…
Author: M1ckm <mmmickmason2(a)gmail.com>
Date: 2017-11-13 (Mon, 13 Nov 2017)
Changed paths:
M po/en_GB.po
Log Message:
-----------
Translated using Weblate (English (United Kingdom))
Currently translated at 98.7% (3225 of 3267 strings)
[CI skip]
Commit: d9ab8cbd891c4e16f43984acc322d652da480f7f
https://github.com/phpmyadmin/phpmyadmin/commit/d9ab8cbd891c4e16f43984acc32…
Author: Weblate <noreply(a)weblate.org>
Date: 2017-11-13 (Mon, 13 Nov 2017)
Changed paths:
M doc/faq.rst
M doc/two_factor.rst
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 842d35792fb43ca6e8c7da379e7e91caf0a61c22
https://github.com/phpmyadmin/phpmyadmin/commit/842d35792fb43ca6e8c7da379e7…
Author: Weblate <noreply(a)weblate.org>
Date: 2017-11-13 (Mon, 13 Nov 2017)
Changed paths:
M js/functions.js
R js/get_image.js.php
M libraries/classes/Header.php
M libraries/classes/Scripts.php
M libraries/classes/Theme.php
M libraries/classes/Util.php
R scripts/generate-sprites
M test/classes/Config/FormDisplayTemplateTest.php
M test/classes/FooterTest.php
M test/classes/InsertEditTest.php
M test/classes/MessageTest.php
M test/classes/Plugins/Auth/AuthenticationConfigTest.php
M test/classes/ThemeTest.php
M test/classes/UtilTest.php
M test/libraries/Files_test.php
M test/selenium/TestBase.php
R themes/original/img/sprites.png
R themes/original/sprites.lib.php
R themes/pmahomme/img/sprites.png
R themes/pmahomme/sprites.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b2f25b50ad48...842d35792fb4
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: cedad5f9314b9ac5bf2f5017bd57ca321b2cfb6e
https://github.com/phpmyadmin/phpmyadmin/commit/cedad5f9314b9ac5bf2f5017bd5…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-11-13 (Mon, 13 Nov 2017)
Changed paths:
M js/functions.js
R js/get_image.js.php
M libraries/classes/Header.php
M libraries/classes/Scripts.php
M libraries/classes/Theme.php
M libraries/classes/Util.php
R scripts/generate-sprites
M test/classes/Config/FormDisplayTemplateTest.php
M test/classes/FooterTest.php
M test/classes/InsertEditTest.php
M test/classes/MessageTest.php
M test/classes/Plugins/Auth/AuthenticationConfigTest.php
M test/classes/ThemeTest.php
M test/classes/UtilTest.php
M test/libraries/Files_test.php
M test/selenium/TestBase.php
R themes/original/img/sprites.png
R themes/original/sprites.lib.php
R themes/pmahomme/img/sprites.png
R themes/pmahomme/sprites.lib.php
Log Message:
-----------
Remove sprites from the themes
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: b2f25b50ad4880e49406e0aea5deccccb82686cb
https://github.com/phpmyadmin/phpmyadmin/commit/b2f25b50ad4880e49406e0aea5d…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-11-13 (Mon, 13 Nov 2017)
Changed paths:
M js/functions.js
R js/get_image.js.php
M libraries/classes/Header.php
M libraries/classes/Scripts.php
M libraries/classes/Theme.php
M libraries/classes/Util.php
R scripts/generate-sprites
M test/classes/Config/FormDisplayTemplateTest.php
M test/classes/FooterTest.php
M test/classes/InsertEditTest.php
M test/classes/MessageTest.php
M test/classes/Plugins/Auth/AuthenticationConfigTest.php
M test/classes/ThemeTest.php
M test/classes/UtilTest.php
M test/libraries/Files_test.php
M test/selenium/TestBase.php
R themes/original/img/sprites.png
R themes/original/sprites.lib.php
R themes/pmahomme/img/sprites.png
R themes/pmahomme/sprites.lib.php
Log Message:
-----------
Merge pull request #13797 from nijel/nosprites
Remove sprites from the themes
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/912d367a3b4c...b2f25b50ad48
Branch: refs/heads/QA_4_7
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 9f3449275ea9133ca258f2adafa147a1b25b4e16
https://github.com/phpmyadmin/phpmyadmin/commit/9f3449275ea9133ca258f2adafa…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-11-13 (Mon, 13 Nov 2017)
Changed paths:
M ChangeLog
M libraries/config.default.php
Log Message:
-----------
Add SJIS-win to default list of allowed charsets
Fixes #13803
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 895ee146d625ee01ab837684711c93e6c23abcd8
https://github.com/phpmyadmin/phpmyadmin/commit/895ee146d625ee01ab837684711…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2017-11-13 (Mon, 13 Nov 2017)
Changed paths:
M libraries/classes/Header.php
Log Message:
-----------
Fix undefined variable wihout DB connection
This might be called from path where DB connection is not needed.
Fixes #13805
Signed-off-by: Michal Čihař <michal(a)cihar.com>