Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1c85cb44c78ceed9a33b21587c44f41bfecfe00a https://github.com/phpmyadmin/phpmyadmin/commit/1c85cb44c78ceed9a33b21587c44... Author: Володимир bardvv@gmail.com Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths: M po/uk.po
Log Message: ----------- Translated using Weblate (Ukrainian)
Currently translated at 79.7% (2552 of 3199 strings)
[CI skip]
Commit: 95bd933362bd1a05f67d51c383fb1d451ea08780 https://github.com/phpmyadmin/phpmyadmin/commit/95bd933362bd1a05f67d51c383fb... Author: Weblate noreply@weblate.org Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths: M .travis.yml M README.rst
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7
Commit: 46b088d4440f4a5d0a159f16e4fbd69da4608567 https://github.com/phpmyadmin/phpmyadmin/commit/46b088d4440f4a5d0a159f16e4fb... Author: tmtisfree tmtisfree@free.fr Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths: M po/fr.po
Log Message: ----------- Translated using Weblate (French)
Currently translated at 100.0% (3199 of 3199 strings)
[CI skip]
Commit: f8edf0376b3c7d8dfb00c00b6baf633a9bc16741 https://github.com/phpmyadmin/phpmyadmin/commit/f8edf0376b3c7d8dfb00c00b6baf... Author: Michal Čihař michal@cihar.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M libraries/ErrorHandler.php
Log Message: ----------- 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
Commit: 1a4c5e4e8f55d65f593d5065856b554541665dbf https://github.com/phpmyadmin/phpmyadmin/commit/1a4c5e4e8f55d65f593d5065856b... Author: Michal Čihař michal@cihar.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M libraries/ErrorHandler.php
Log Message: ----------- Remove commented out code
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 999a58609f2c33675da1ce48aed025fc72c07085 https://github.com/phpmyadmin/phpmyadmin/commit/999a58609f2c33675da1ce48aed0... Author: Michal Čihař michal@cihar.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M libraries/ErrorHandler.php
Log Message: ----------- 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
Commit: 28dc8a4b686dca9b354eacfd19daacbb397cd7b4 https://github.com/phpmyadmin/phpmyadmin/commit/28dc8a4b686dca9b354eacfd19da... Author: Michal Čihař michal@cihar.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Changed paths: M libraries/ErrorHandler.php M po/fr.po M po/uk.po
Log Message: ----------- Merge branch 'QA_4_7'
Commit: 67fbacc64200d35872b6e9330d1e71acbe7a21e8 https://github.com/phpmyadmin/phpmyadmin/commit/67fbacc64200d35872b6e9330d1e... Author: Michal Čihař michal@cihar.com Date: 2017-02-22 (Wed, 22 Feb 2017)
Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/be3da02e9a7a...67fbacc64200
-
Michal Čihař