Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bbadf0a1f801ad7d6c83521639ecea4ef8b0f232 https://github.com/phpmyadmin/phpmyadmin/commit/bbadf0a1f801ad7d6c83521639ec... Author: Achilles-96 <raghuram.vadapalli@research.iiit.ac.in> Date: 2016-07-17 (Sun, 17 Jul 2016) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Fixes #12378 - Support for IPv6 proxies Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in> Commit: b705dc5f6784dfec60fd788e9bdaa969668fb150 https://github.com/phpmyadmin/phpmyadmin/commit/b705dc5f6784dfec60fd788e9bda... Author: Pavel Rochnyack <pavel2000@ngs.ru> Date: 2016-07-29 (Fri, 29 Jul 2016) Changed paths: M libraries/controllers/server/ServerDatabasesController.php Log Message: ----------- Fix replication status output in Server > Databases Broken by 829a84b46e101cc5caa3a4252ea6f4453c49528d refactoring. Incorrectly fixed in c4710c3e1d20c95b6cf5081d02ac50eda86d2538 Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru> Commit: 489970f218cdaf6ed81ad3843f5228f5dcf5ed97 https://github.com/phpmyadmin/phpmyadmin/commit/489970f218cdaf6ed81ad3843f52... Author: Michal Čihař <michal@cihar.com> Date: 2016-07-29 (Fri, 29 Jul 2016) Changed paths: M ChangeLog M server_privileges.php Log Message: ----------- Fixed deleting users in non English locales Fixes #12413 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 74016bceeaddcd91ddcae045de61ddec53a5ce55 https://github.com/phpmyadmin/phpmyadmin/commit/74016bceeaddcd91ddcae045de61... Author: Michal Čihař <michal@cihar.com> Date: 2016-07-29 (Fri, 29 Jul 2016) Changed paths: M libraries/controllers/server/ServerDatabasesController.php Log Message: ----------- Merge pull request #12416 from rpv-tomsk/fix-replication-status Fix replication status output in Server > Databases Commit: de1e473a9dfc50d2a7e71b618706c9e13a87f13d https://github.com/phpmyadmin/phpmyadmin/commit/de1e473a9dfc50d2a7e71b618706... Author: Michal Čihař <michal@cihar.com> Date: 2016-07-29 (Fri, 29 Jul 2016) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for issue #12416 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 29c0ddaaf167d4663068c28e0feb7529e790ce54 https://github.com/phpmyadmin/phpmyadmin/commit/29c0ddaaf167d4663068c28e0feb... Author: Michal Čihař <michal@cihar.com> Date: 2016-07-29 (Fri, 29 Jul 2016) Changed paths: M ChangeLog M libraries/controllers/server/ServerDatabasesController.php M server_privileges.php Log Message: ----------- Merge branch 'QA_4_6' Commit: 25b4d840fba80a2106275114b42a57403d13ba9c https://github.com/phpmyadmin/phpmyadmin/commit/25b4d840fba80a2106275114b42a... Author: Michal Čihař <michal@cihar.com> Date: 2016-07-29 (Fri, 29 Jul 2016) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/12389' Commit: 314ec0a1f9eaf1a4dedc6c9801dc0479eecbd7e1 https://github.com/phpmyadmin/phpmyadmin/commit/314ec0a1f9eaf1a4dedc6c9801dc... Author: Michal Čihař <michal@cihar.com> Date: 2016-07-29 (Fri, 29 Jul 2016) Changed paths: M libraries/ip_allow_deny.lib.php Log Message: ----------- Simplify IP address validation - check IPv4 and IPv6 in one call - type strict checking of return value See issue #12389 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 9588dbd4aaf7eb8c9558444ba52610a5a12e1aba https://github.com/phpmyadmin/phpmyadmin/commit/9588dbd4aaf7eb8c9558444ba526... Author: Michal Čihař <michal@cihar.com> Date: 2016-07-29 (Fri, 29 Jul 2016) Changed paths: M ChangeLog Log Message: ----------- Add changelog entry Fixes #12378 Fixes #12389 Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bcb9c7d16a5c...9588dbd4aaf7