Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e9e4faaeb4a29db231afebe872410de3981e6da0 https://github.com/phpmyadmin/phpmyadmin/commit/e9e4faaeb4a29db231afebe87241... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-12-05 (Fri, 05 Dec 2014) Changed paths: M ChangeLog M js/tbl_gis_visualization.js Log Message: ----------- bug #4618 Page scrolls while GIS visualization is zoomed in/out with mousewheel Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 270b37c7752b85c0ef6baae50198aa372c8382ee https://github.com/phpmyadmin/phpmyadmin/commit/270b37c7752b85c0ef6baae50198... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-12-05 (Fri, 05 Dec 2014) Changed paths: M ChangeLog M js/tbl_gis_visualization.js M libraries/central_columns.lib.php M libraries/insert_edit.lib.php M libraries/relation.lib.php M test/libraries/PMA_central_columns_test.php Log Message: ----------- Merge branch 'QA_4_3' Commit: 49109dc2e52f6ba612e3bcd5a6f986b3b59615aa https://github.com/phpmyadmin/phpmyadmin/commit/49109dc2e52f6ba612e3bcd5a6f9... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-12-05 (Fri, 05 Dec 2014) Changed paths: M .travis.yml M build.xml M composer.json M libraries/Util.class.php A test/install-browserstack A test/install-runkit Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3062152abfdf...49109dc2e52f