Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 2b74163914a675198c0b27446ad24099f9f27d3b
https://github.com/phpmyadmin/phpmyadmin/commit/2b74163914a675198c0b27446ad24099f9f27d3b
Author: chintan zaveri <zaveri_chin...@rediff.com>
Date: 2016-02-20 (Sat, 20 Feb 2016)
Changed paths:
M .scrutinizer.yml
M build.xml
M config.sample.inc.php
M doc/config.rst
M doc/setup.rst
R examples/swekey.sample.conf
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/plugins/auth/AuthenticationCookie.php
R libraries/plugins/auth/swekey/authentication.inc.php
R libraries/plugins/auth/swekey/musbe-ca.crt
R libraries/plugins/auth/swekey/swekey.auth.lib.php
R libraries/plugins/auth/swekey/swekey.php
M phpunit.xml.dist
M test/classes/plugin/auth/AuthenticationCookieTest.php
Log Message:
-----------
Removal of Swekey
Signed-off-by: Chintan Zaveri <zaveri_chin...@rediff.com>
master rebased
Signed-off-by: Chintan Zaveri <zaveri_chin...@rediff.com>
Commit: 2fffee3093fb62247a89a204f094101f4f08ffb2
https://github.com/phpmyadmin/phpmyadmin/commit/2fffee3093fb62247a89a204f094101f4f08ffb2
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-02-22 (Mon, 22 Feb 2016)
Changed paths:
M .scrutinizer.yml
M build.xml
M config.sample.inc.php
M doc/config.rst
M doc/setup.rst
R examples/swekey.sample.conf
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/plugins/auth/AuthenticationCookie.php
R libraries/plugins/auth/swekey/authentication.inc.php
R libraries/plugins/auth/swekey/musbe-ca.crt
R libraries/plugins/auth/swekey/swekey.auth.lib.php
R libraries/plugins/auth/swekey/swekey.php
M phpunit.xml.dist
M test/classes/plugin/auth/AuthenticationCookieTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/pull/11986'
Commit: 39d948d6109ffd739b5da263c5eb016a521bfafc
https://github.com/phpmyadmin/phpmyadmin/commit/39d948d6109ffd739b5da263c5eb016a521bfafc
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-02-22 (Mon, 22 Feb 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Add changelog entry for Swekey removal
Fixes #11981
Signed-off-by: Michal Čihař <mic...@cihar.com>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/59a48786e2a4...39d948d6109f_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git
