Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4905240aedd8bb1375c10bae8aaff9df64092e71 https://github.com/phpmyadmin/phpmyadmin/commit/4905240aedd8bb1375c10bae8aaf... Author: Marc Delisle marc@infomarc.info Date: 2013-11-03 (Sun, 03 Nov 2013)

Changed paths: M libraries/DatabaseInterface.class.php

Log Message: ----------- The DisableIS directive is being deprecated

Commit: d64ea21bed870cab7673025fccbf1c3c6a16a20f https://github.com/phpmyadmin/phpmyadmin/commit/d64ea21bed870cab7673025fccbf... Author: Marc Delisle marc@infomarc.info Date: 2013-11-03 (Sun, 03 Nov 2013)

Changed paths: M ChangeLog M js/config.js M libraries/Config.class.php M libraries/config/ConfigFile.class.php M libraries/config/Form.class.php M libraries/config/FormDisplay.class.php M libraries/config/FormDisplay.tpl.php M libraries/config/Validator.class.php M libraries/core.lib.php M libraries/user_preferences.inc.php M libraries/user_preferences.lib.php M po/da.po M po/pl.po M prefs_forms.php M prefs_manage.php M setup/config.php M setup/frames/config.inc.php M setup/frames/form.inc.php M setup/frames/index.inc.php M setup/frames/servers.inc.php M setup/lib/ConfigGenerator.class.php M setup/lib/common.inc.php M setup/lib/form_processing.lib.php M setup/lib/index.lib.php M setup/styles.css M setup/validate.php M test/classes/config/PMA_FormDisplay_test.php M test/classes/config/PMA_Form_test.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php M test/libraries/PMA_ConfigFile_test.php M test/libraries/PMA_ConfigGenerator_test.php M test/libraries/PMA_FormDisplay_tpl_test.php R test/libraries/PMA_Index_test.php A test/libraries/PMA_SetupIndex_test.php M test/libraries/PMA_user_preferences_test.php

Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0f717860312a...d64ea21bed87