Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8ef75d7f729b7f27c1e470ccb682c1f7586b8bee https://github.com/phpmyadmin/phpmyadmin/commit/8ef75d7f729b7f27c1e470ccb682... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths: M .travis.yml M build.xml M composer.json
Log Message: ----------- Try to fix build in Travis
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f6cf089508fe77c5c72799bfd53a6bba0a36ccee https://github.com/phpmyadmin/phpmyadmin/commit/f6cf089508fe77c5c72799bfd53a... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths: M phpunit.xml.dist
Log Message: ----------- Disable html coverage report
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 13dbcef69426839f8d169aab44a4d3a55ae4d228 https://github.com/phpmyadmin/phpmyadmin/commit/13dbcef69426839f8d169aab44a4... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths: M build.xml
Log Message: ----------- Sync build.xml with master
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ea2c8f66f2c701bdfd05a8e2f28b58596d0faf41 https://github.com/phpmyadmin/phpmyadmin/commit/ea2c8f66f2c701bdfd05a8e2f28b... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths: M .travis.yml M build.xml M composer.json M phpunit.xml.dist
Log Message: ----------- Merge branch 'MAINT_4_1_14' into QA_4_1
Commit: df794d4380bfcc056e72efda8940c07751482b35 https://github.com/phpmyadmin/phpmyadmin/commit/df794d4380bfcc056e72efda8940... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths: M test/classes/plugin/PMA_PluginManager_test.php
Log Message: ----------- Skip failing tests
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 649f8249605e2f6fead24322c08ea89548df7a31 https://github.com/phpmyadmin/phpmyadmin/commit/649f8249605e2f6fead24322c08e... Author: Michal Čihař michal@cihar.com Date: 2014-12-04 (Thu, 04 Dec 2014)
Changed paths: M test/classes/plugin/PMA_PluginManager_test.php
Log Message: ----------- Merge branch 'MAINT_4_1_14' into QA_4_1
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/beeba6a787ca...649f8249605e
-
Michal Čihař