Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: eef59d6c487102b8d78f4393096a448c9136bfa1 https://github.com/phpmyadmin/phpmyadmin/commit/eef59d6c487102b8d78f4393096a... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-12 (Wed, 12 Oct 2016) Changed paths: M libraries/config/ConfigFile.php M libraries/config/Validator.php Log Message: ----------- Fix order of testing DBConnection with different parameters in Config method In setup, try to follow what the docs say. 'Password login is still tried first, but as fallback, no password method is tried.' Fix #12472 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 5a413ae6df0ad032be2532f2b668e299fd682479 https://github.com/phpmyadmin/phpmyadmin/commit/5a413ae6df0ad032be2532f2b668... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-12 (Wed, 12 Oct 2016) Changed paths: M test/classes/config/ConfigFileTest.php Log Message: ----------- Add tests Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 6a4cf7b1ec65e9cb3ff976d55e11f91fffe510dc https://github.com/phpmyadmin/phpmyadmin/commit/6a4cf7b1ec65e9cb3ff976d55e11... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M libraries/config/ConfigFile.php M libraries/config/Validator.php M test/classes/config/ConfigFileTest.php Log Message: ----------- Merge pull request #12631 from devenbansod/fix_12472 Fix order of testing DBConnection with different parameters in Config method Commit: 307dd633543e2298a8041b054e842422a645f570 https://github.com/phpmyadmin/phpmyadmin/commit/307dd633543e2298a8041b054e84... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for #12472 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 0e03ffdb7603465ed31a20202c857a6c467db301 https://github.com/phpmyadmin/phpmyadmin/commit/0e03ffdb7603465ed31a20202c85... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M ChangeLog M libraries/config/ConfigFile.php M libraries/config/Validator.php M test/classes/config/ConfigFileTest.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 1aee86a4fe40ac88e682b4792b4c67e9c5bcdce2 https://github.com/phpmyadmin/phpmyadmin/commit/1aee86a4fe40ac88e682b4792b4c... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M doc/config.rst M libraries/config.default.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M test/classes/config/ConfigFileTest.php Log Message: ----------- Remove the nopasswd setting It does nothing since removal of related feature in 53f541af86dc0f020e36c43b4446943efc0cc675. Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4311ea09d9f1...1aee86a4fe40