Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b939fb3d3640d3bfe9fac6e023ae74cfc28862c https://github.com/phpmyadmin/phpmyadmin/commit/1b939fb3d3640d3bfe9fac6e023a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-26 (Thu, 26 Feb 2015)

Changed paths: M doc/config.rst M libraries/config.default.php M libraries/config/ServerConfigChecks.class.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/plugins/auth/AuthenticationCookie.class.php

Log Message: ----------- rfe #1441 Add regexp match when using AllowArbitraryServer

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: f5a90022092ea683d6e9a6420b2e3b054eee5e81 https://github.com/phpmyadmin/phpmyadmin/commit/f5a90022092ea683d6e9a6420b2e... Author: Marc Delisle marc@infomarc.info Date: 2015-02-28 (Sat, 28 Feb 2015)

Changed paths: M doc/config.rst M libraries/config.default.php M libraries/config/ServerConfigChecks.class.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/plugins/auth/AuthenticationCookie.class.php

Log Message: ----------- Merge pull request #1520 from madhuracj/rfe1441

rfe #1441 Add regexp match when using AllowArbitraryServer

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4e956a574b15...f5a90022092e