Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 743a5288350596e067da2569abe5f663a79c4d67
https://github.com/phpmyadmin/phpmyadmin/commit/743a5288350596e067da2569abe5f663a79c4d67
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2015-01-08 (Thu, 08 Jan 2015)
Changed paths:
M ChangeLog
M libraries/Header.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/LICENSE
A libraries/plugins/auth/recaptcha/recaptchalib.php
R libraries/plugins/auth/recaptchalib.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message:
-----------
rfe #1590 Recaptcha API v2
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 8169ab1fe5cda279048461c5b7c14f403cc595ba
https://github.com/phpmyadmin/phpmyadmin/commit/8169ab1fe5cda279048461c5b7c14f403cc595ba
Author: Marc Delisle <m...@infomarc.info>
Date: 2015-01-08 (Thu, 08 Jan 2015)
Changed paths:
M ChangeLog
M libraries/Header.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/LICENSE
A libraries/plugins/auth/recaptcha/recaptchalib.php
R libraries/plugins/auth/recaptchalib.php
M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <m...@infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/2ec944b824c1...8169ab1fe5cd------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
