Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9484413e3d9f5d5de9769287185fe276cb96e689 https://github.com/phpmyadmin/phpmyadmin/commit/9484413e3d9f5d5de9769287185f... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)

Changed paths: M .travis.yml

Log Message: ----------- Specify we are using MySQL service

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 9d24e4649b8d69594d4aa2cd3cef8e5c9c645b69 https://github.com/phpmyadmin/phpmyadmin/commit/9d24e4649b8d69594d4aa2cd3cef... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)

Changed paths: M .travis.yml

Log Message: ----------- Do not create database if exits

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 9ecda4175b6c19c781cf23254da151bfa15eb81a https://github.com/phpmyadmin/phpmyadmin/commit/9ecda4175b6c19c781cf23254da1... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)

Changed paths: M .travis.yml M test/ci-test M test/install-runkit

Log Message: ----------- Run Travis CI tests on OS X as well

- install dependencies using brew - manuall start MariaDB server

Issue #12883

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 393402406180291d84161d72baa7d9dbf4e5dee3 https://github.com/phpmyadmin/phpmyadmin/commit/393402406180291d84161d72baa7... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)

Changed paths: M libraries/Util.php

Log Message: ----------- Handle AM/PM marks in date on our own

This is same as with months and days in week - we can not rely on the PHP providing sane result. Also this way we can properly translate it to all supported languages.

For example on OS X, the strftime function does not seem to respect PHP locales and always use system ones.

Fixes #12913

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 838419957dfb0b3d9000dd16d10ba54ab0faa3cd https://github.com/phpmyadmin/phpmyadmin/commit/838419957dfb0b3d9000dd16d10b... Author: Michal Čihař michal@cihar.com Date: 2017-01-21 (Sat, 21 Jan 2017)

Changed paths: M .travis.yml M libraries/Util.php M test/ci-test M test/install-runkit

Log Message: ----------- Merge pull request #12909 from nijel/osx

Run Travis CI tests on OS X as well

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d2ade81788bf...838419957dfb