Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f7d1c1f46382e7e6464fd92529d4410e635805f1 https://github.com/phpmyadmin/phpmyadmin/commit/f7d1c1f46382e7e6464fd92529d4... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entries for security release Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 4f57305eab809a8ecfe613e38b2b5d3a4b190505 https://github.com/phpmyadmin/phpmyadmin/commit/4f57305eab809a8ecfe613e38b2b... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-06-23 (Thu, 23 Jun 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Release 4.6.3 Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: f2db92434b71973a1281dfbaec8837e51e602c77 https://github.com/phpmyadmin/phpmyadmin/commit/f2db92434b71973a1281dfbaec88... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-06-23 (Thu, 23 Jun 2016) Changed paths: M examples/openid.php M import.php M js/ajax.js M js/console.js M js/functions.js M js/get_image.js.php M js/get_scripts.js.php M js/tbl_chart.js M libraries/Config.php M libraries/DbQbe.php M libraries/Header.php M libraries/SavedSearches.php M libraries/Tracker.php M libraries/Util.php M libraries/config/FormDisplay.php M libraries/config/Validator.php M libraries/controllers/table/TableSearchController.php M libraries/core.lib.php M libraries/operations.lib.php M libraries/plugins/export/ExportSql.php M libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php M libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php M libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/InlineTransformationsPlugin.php M libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php M libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php M libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php M libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php M libraries/server_privileges.lib.php M libraries/transformations.lib.php M setup/config.php M setup/frames/index.inc.php M setup/validate.php M templates/columns_definitions/transformation.phtml M templates/server/binlog/log_selector.phtml M templates/server/databases/table_row.phtml M templates/table/search/rows_zoom.phtml M templates/table/structure/display_partitions.phtml M templates/table/structure/display_table_stats.phtml M test/classes/plugin/transformations/TransformationPluginsTest.php M test/libraries/PMA_transformation_test.php A test/libraries/core/PMA_cleanupPathInfo_test.php M test/libraries/core/PMA_warnMissingExtension_test.php Log Message: ----------- Fix merge conflicts Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 58534ce2fc4f964c78dfe83ff5f21e05793c3a4f https://github.com/phpmyadmin/phpmyadmin/commit/58534ce2fc4f964c78dfe83ff5f2... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-06-23 (Thu, 23 Jun 2016) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.php Log Message: ----------- Prepare for 4.6.4-dev Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Commit: 292c0a1ff9ccc0b89d6496f9f3bd446bc30cd91a https://github.com/phpmyadmin/phpmyadmin/commit/292c0a1ff9ccc0b89d6496f9f3bd... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2016-06-23 (Thu, 23 Jun 2016) Changed paths: M ChangeLog Log Message: ----------- Fix merge conflicts Signed-off-by: Isaac Bennetch <bennetch@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c3f7aa8190b4...292c0a1ff9cc