Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 34720c2365d0b198fa6e2e2b988a3dc7d7945d5a https://github.com/phpmyadmin/phpmyadmin/commit/34720c2365d0b198fa6e2e2b988a... Author: Nisarg Jhaveri <nisargjhaveri@gmail.com> Date: 2015-05-31 (Sun, 31 May 2015) Changed paths: M doc/config.rst M import.php M js/functions.js M js/messages.php M libraries/DatabaseInterface.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/config.values.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/display_import.lib.php M libraries/import.lib.php M libraries/mult_submits.inc.php M libraries/mult_submits.lib.php M libraries/sql_query_form.lib.php Log Message: ----------- Disable foreign key checks in SQL query box and config option Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com> Commit: d1937fbe9c4e02619e46f6e2d102bc5ab771d0ab https://github.com/phpmyadmin/phpmyadmin/commit/d1937fbe9c4e02619e46f6e2d102... Author: Marc Delisle <marc@infomarc.info> Date: 2015-05-31 (Sun, 31 May 2015) Changed paths: M doc/config.rst M import.php M js/functions.js M js/messages.php M libraries/DatabaseInterface.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/config.values.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/display_import.lib.php M libraries/import.lib.php M libraries/mult_submits.inc.php M libraries/mult_submits.lib.php M libraries/sql_query_form.lib.php Log Message: ----------- Merge pull request #1698 from nisargjhaveri/fk_check_sql Disable foreign key checks in SQL query box Compare: https://github.com/phpmyadmin/phpmyadmin/compare/80c0260c409d...d1937fbe9c4e