[Phpmyadmin-git] [phpmyadmin/phpmyadmin] be237a: rfe #954 Allow SALT in ENCRYPT function

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: be237a7b511b5ff146297557edabb69a61fefb2b https://github.com/phpmyadmin/phpmyadmin/commit/be237a7b511b5ff146297557eda… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-02-02 (Mon, 02 Feb 2015) Changed paths: M ChangeLog M js/tbl_change.js M libraries/insert_edit.lib.php Log Message: ----------- rfe #954 Allow SALT in ENCRYPT function Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: f8f05f36f7d5e148c4b8717d5c0260407a419543 https://github.com/phpmyadmin/phpmyadmin/commit/f8f05f36f7d5e148c4b8717d5c0… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-02-02 (Mon, 02 Feb 2015) Changed paths: M libraries/plugins/AuthenticationPlugin.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/AuthenticationHttp.class.php M user_password.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/be03cb3f27d1...f8f05f36f7d5