Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3b6a994dcdf2cbcfa23caa51b3719ba924aab20a https://github.com/phpmyadmin/phpmyadmin/commit/3b6a994dcdf2cbcfa23caa51b371... Author: Michal Čihař <michal@cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M import.php M index.php M libraries/classes/Config.php M libraries/classes/Config/Descriptions.php M libraries/classes/Config/Forms/User/FeaturesForm.php M libraries/classes/DatabaseInterface.php M libraries/classes/Header.php M libraries/classes/Url.php M libraries/classes/UserPreferences.php M libraries/common.inc.php M prefs_manage.php M test/classes/ConfigTest.php M test/classes/Database/SearchTest.php M test/classes/DatabaseInterfaceTest.php M test/classes/Display/ResultsTest.php M test/classes/FooterTest.php M test/classes/InsertEditTest.php M test/classes/MessageTest.php M test/classes/Plugins/Auth/AuthenticationConfigTest.php M test/classes/Plugins/Auth/AuthenticationCookieTest.php M test/classes/SanitizeTest.php M test/classes/Server/PrivilegesTest.php M test/classes/ThemeManagerTest.php M test/classes/ThemeTest.php M test/classes/UrlTest.php M test/classes/UserPreferencesTest.php Log Message: ----------- Move collation connection setting to user preferences It is now handled same way as other user settings. Issue #11688 Issue #13466 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 6a0345b10e90cf450bf5f169ba7b2e8653591194 https://github.com/phpmyadmin/phpmyadmin/commit/6a0345b10e90cf450bf5f169ba7b... Author: Michal Čihař <michal@cihar.com> Date: 2017-11-29 (Wed, 29 Nov 2017) Changed paths: M import.php M index.php M libraries/classes/Config.php M libraries/classes/Config/Descriptions.php M libraries/classes/Config/Forms/User/FeaturesForm.php M libraries/classes/DatabaseInterface.php M libraries/classes/Header.php M libraries/classes/Url.php M libraries/classes/UserPreferences.php M libraries/common.inc.php M prefs_manage.php M test/classes/ConfigTest.php M test/classes/Database/SearchTest.php M test/classes/DatabaseInterfaceTest.php M test/classes/Display/ResultsTest.php M test/classes/FooterTest.php M test/classes/InsertEditTest.php M test/classes/MessageTest.php M test/classes/Plugins/Auth/AuthenticationConfigTest.php M test/classes/Plugins/Auth/AuthenticationCookieTest.php M test/classes/SanitizeTest.php M test/classes/Server/PrivilegesTest.php M test/classes/ThemeManagerTest.php M test/classes/ThemeTest.php M test/classes/UrlTest.php M test/classes/UserPreferencesTest.php Log Message: ----------- Merge pull request #13847 from nijel/collation Move collation connection setting to user preferences Compare: https://github.com/phpmyadmin/phpmyadmin/compare/63f5b90ad536...6a0345b10e90