Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8bc91e9b5837c4395ba1d932c56e30e1f8e8fdb4
      
https://github.com/phpmyadmin/phpmyadmin/commit/8bc91e9b5837c4395ba1d932c56e30e1f8e8fdb4
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M ChangeLog
    M composer.json
    M libraries/plugins/auth/AuthenticationCookie.php

  Log Message:
  -----------
  Revert "Compatibility with phpseclib 2.0.8"

This reverts commit a450935e53a130319b84ce180a3456009e2c04b4.

We really need to stick on 2.0.7 for 4.7 branch to keep PHP 5.5 support.

Issue #13846


  Commit: f8ccc4db13d3255e3083d37886747580bc3ddf99
      
https://github.com/phpmyadmin/phpmyadmin/commit/f8ccc4db13d3255e3083d37886747580bc3ddf99
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M composer.json

  Log Message:
  -----------
  Stick with phpseclib < 2.0.8 in 4.7 branch

We can not remove PHP 5.5 support from maintenance branch, so there is
no other way than sticking with older phpseclib.

See https://github.com/phpseclib/phpseclib/issues/1218

Issue #13846

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 6aeae463d1de02169d440fa65655499ad33351ed
      
https://github.com/phpmyadmin/phpmyadmin/commit/6aeae463d1de02169d440fa65655499ad33351ed
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2017-11-29 (Wed, 29 Nov 2017)

  Changed paths:
    M ChangeLog
    M composer.json
    M libraries/classes/Plugins/Auth/AuthenticationCookie.php

  Log Message:
  -----------
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/a8f358e2c60f...6aeae463d1de
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to