Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 79d33084f3e7036b81487347138b2ae70179d459 https://github.com/phpmyadmin/phpmyadmin/commit/79d33084f3e7036b81487347138b... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/LanguageTest.php
Log Message: ----------- Add validation prior to using object
Otherwise the test failure is really not obvious.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 15bac5f51282712656fb6273d046e18faf81aa1a https://github.com/phpmyadmin/phpmyadmin/commit/15bac5f51282712656fb6273d046... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/ConfigTest.php M test/classes/VersionInformationTest.php
Log Message: ----------- Flag tests needing network access
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e182ba99072dab5a83cb2a8f06d3d86b97718d12 https://github.com/phpmyadmin/phpmyadmin/commit/e182ba99072dab5a83cb2a8f06d3... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/ConfigTest.php
Log Message: ----------- Revert to auto for further tests
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e3641a386b5e2338f67282c411c4a1817f840189 https://github.com/phpmyadmin/phpmyadmin/commit/e3641a386b5e2338f67282c411c4... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M libraries/gis/GISVisualization.php
Log Message: ----------- Avoid using hardcoded tcpdf path
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 18a96f017889bd866c94c734864cd634f9d9016e https://github.com/phpmyadmin/phpmyadmin/commit/18a96f017889bd866c94c734864c... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/gis/GISGeometrycollectionTest.php M test/classes/gis/GISLinestringTest.php M test/classes/gis/GISMultilinestringTest.php M test/classes/gis/GISMultipointTest.php M test/classes/gis/GISMultipolygonTest.php M test/classes/gis/GISPointTest.php M test/classes/gis/GISPolygonTest.php
Log Message: ----------- Fix path to tcpdf include
Otherwise we do not honor vendor configuration.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: ec9139edefc9fd916c31cd06213558d64eaadbce https://github.com/phpmyadmin/phpmyadmin/commit/ec9139edefc9fd916c31cd062135... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/gis/GISGeometrycollectionTest.php M test/classes/gis/GISLinestringTest.php M test/classes/gis/GISMultilinestringTest.php M test/classes/gis/GISMultipointTest.php M test/classes/gis/GISMultipolygonTest.php M test/classes/gis/GISPointTest.php M test/classes/gis/GISPolygonTest.php M test/classes/plugin/transformations/TransformationPluginsTest.php
Log Message: ----------- Do not try to run gd based tests if gd extension is not there
Signed-off-by: Michal Čihař michal@cihar.com
Commit: f86aca5b8057e91b931f8737d8f321f9e58fa1e5 https://github.com/phpmyadmin/phpmyadmin/commit/f86aca5b8057e91b931f8737d8f3... Author: Michal Čihař michal@cihar.com Date: 2016-12-06 (Tue, 06 Dec 2016)
Changed paths: M test/classes/ConfigTest.php M test/classes/LanguageTest.php M test/classes/UtilTest.php M test/classes/VersionInformationTest.php M test/classes/gis/GISGeometrycollectionTest.php M test/classes/gis/GISLinestringTest.php M test/classes/gis/GISMultilinestringTest.php M test/classes/gis/GISMultipointTest.php M test/classes/gis/GISMultipolygonTest.php M test/classes/gis/GISPointTest.php M test/classes/gis/GISPolygonTest.php M test/classes/plugin/transformations/TransformationPluginsTest.php
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a370a692523d...f86aca5b8057