Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: cea9aa968871715ad5e57bb43d4babda95fda2a6 https://github.com/phpmyadmin/phpmyadmin/commit/cea9aa968871715ad5e57bb43d4b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2015-03-06 (Fri, 06 Mar 2015)
Changed paths: M js/makegrid.js
Log Message: ----------- Revert c9c280e9921d and b39933c37b8c
Signed-off-by: Atul Pratap Singh atulpratapsingh05@gmail.com
Commit: 42bbc5e04d507bd8e864d04c69f68499755b32ef https://github.com/phpmyadmin/phpmyadmin/commit/42bbc5e04d507bd8e864d04c69f6... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationHttp.class.php
Log Message: ----------- bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 921710ec4de5ea73cb68c2f1dd6ae6ad64f5b350 https://github.com/phpmyadmin/phpmyadmin/commit/921710ec4de5ea73cb68c2f1dd6a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)
Changed paths: M js/makegrid.js
Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Commit: df39cff9ef9eff98b03185204d55920b9882a0dc https://github.com/phpmyadmin/phpmyadmin/commit/df39cff9ef9eff98b03185204d55... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)
Changed paths: M libraries/plugins/auth/AuthenticationHttp.class.php
Log Message: ----------- Return value from the new method
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 1f630a1a97b7fc3a15ff344bd5e9cb60826f5577 https://github.com/phpmyadmin/phpmyadmin/commit/1f630a1a97b7fc3a15ff344bd5e9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)
Changed paths: M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
Log Message: ----------- Update tests
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 7dde05cc4188db5477eec0e872db047110856b1b https://github.com/phpmyadmin/phpmyadmin/commit/7dde05cc4188db5477eec0e872db... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)
Changed paths: M libraries/plugins/auth/AuthenticationHttp.class.php
Log Message: ----------- phpUnit is unable to mock private methods
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 9bf5792dc0fab3132789f93393fe30ab73ebee91 https://github.com/phpmyadmin/phpmyadmin/commit/9bf5792dc0fab3132789f93393fe... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-09 (Mon, 09 Mar 2015)
Changed paths: M ChangeLog M js/makegrid.js M libraries/plugins/auth/AuthenticationHttp.class.php M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
Log Message: ----------- Merge branch 'QA_4_3' into QA_4_4
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a08353de46a4...9bf5792dc0fa
-
Madhura Jayaratne