Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cdcf74ab0bde94d9be5aa29169b2c8ed8141103d https://github.com/phpmyadmin/phpmyadmin/commit/cdcf74ab0bde94d9be5aa29169b2... Author: Michal Čihař michal@cihar.com Date: 2016-08-02 (Tue, 02 Aug 2016)
Changed paths: M ChangeLog M user_password.php
Log Message: ----------- Fixed password change on MariaDB without auth plugin
Fixes #12424
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 0de543c3af1214a2745b48acce5afe5bbc9f32e0 https://github.com/phpmyadmin/phpmyadmin/commit/0de543c3af1214a2745b48acce5a... Author: Marco Pozzato ironpotts@gmail.com Date: 2016-08-02 (Tue, 02 Aug 2016)
Changed paths: M po/it.po
Log Message: ----------- Translated using Weblate (Italian)
Currently translated at 99.9% (3208 of 3209 strings)
[CI skip]
Commit: aaf48b98fb43e457e985a0a7621e2ae539553f73 https://github.com/phpmyadmin/phpmyadmin/commit/aaf48b98fb43e457e985a0a7621e... Author: Burak Yavuz hitowerdigit@hotmail.com Date: 2016-08-02 (Tue, 02 Aug 2016)
Changed paths: M po/tr.po
Log Message: ----------- Translated using Weblate (Turkish)
Currently translated at 100.0% (3209 of 3209 strings)
[CI skip]
Commit: afcec9d9d7fc9ba29db56b7b5f6e2692ce518e79 https://github.com/phpmyadmin/phpmyadmin/commit/afcec9d9d7fc9ba29db56b7b5f6e... Author: Michal Čihař michal@cihar.com Date: 2016-08-02 (Tue, 02 Aug 2016)
Changed paths: M ChangeLog M user_password.php
Log Message: ----------- Merge branch 'QA_4_6'
Commit: 38b73180fd33070f4e28a6baeb4d5dcc24870ad8 https://github.com/phpmyadmin/phpmyadmin/commit/38b73180fd33070f4e28a6baeb4d... Author: Michal Čihař michal@cihar.com Date: 2016-08-02 (Tue, 02 Aug 2016)
Changed paths: M libraries/plugins/auth/AuthenticationCookie.php
Log Message: ----------- Fix password change in cookie auth
We can not set same cookie twice, so we have to avoid sending auth cookie when we're about to change the password.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 696eeb463db655f89330a6719687118bd70b1efe https://github.com/phpmyadmin/phpmyadmin/commit/696eeb463db655f89330a6719687... Author: Michal Čihař michal@cihar.com Date: 2016-08-02 (Tue, 02 Aug 2016)
Changed paths: M libraries/plugins/auth/AuthenticationCookie.php
Log Message: ----------- Merge branch 'QA_4_6'
Commit: 77d5a1e07cce7b4f5090f2dcdff0c2eb9405db4f https://github.com/phpmyadmin/phpmyadmin/commit/77d5a1e07cce7b4f5090f2dcdff0... Author: Michal Čihař michal@cihar.com Date: 2016-08-02 (Tue, 02 Aug 2016)
Changed paths: M po/it.po M po/tr.po
Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6
Commit: 245f85f6c514c9368df9c9144eef0eabcdd735a6 https://github.com/phpmyadmin/phpmyadmin/commit/245f85f6c514c9368df9c9144eef... Author: Michal Čihař michal@cihar.com Date: 2016-08-02 (Tue, 02 Aug 2016)
Changed paths: M po/it.po M po/kab.po M po/tr.po
Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Commit: f67d0e918ed41dc9c10177548c807f8d45d1c99d https://github.com/phpmyadmin/phpmyadmin/commit/f67d0e918ed41dc9c10177548c80... Author: Michal Čihař michal@cihar.com Date: 2016-08-02 (Tue, 02 Aug 2016)
Log Message: ----------- Merge branch 'QA_4_6'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2ef39d4d0d10...f67d0e918ed4
-
Michal Čihař