Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1daa32fb97b90fd1bf233cae9ed249e37fa175c4 https://github.com/phpmyadmin/phpmyadmin/commit/1daa32fb97b90fd1bf233cae9ed2... Author: Michal Čihař michal@cihar.com Date: 2014-12-03 (Wed, 03 Dec 2014)

Changed paths: M ChangeLog M url.php

Log Message: ----------- bug #4612 [security] XSS vulnerability in redirection mechanism

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: a4e8d008f407d92c7177bca799c54525ba9032ad https://github.com/phpmyadmin/phpmyadmin/commit/a4e8d008f407d92c7177bca799c5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-03 (Wed, 03 Dec 2014)

Changed paths: M ChangeLog M libraries/common.inc.php M libraries/plugins/AuthenticationPlugin.class.php M libraries/plugins/auth/AuthenticationCookie.class.php

Log Message: ----------- bug #4611 [security] DOS attack with long passwords

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 20d0f08c587288698d813e22bd7b8de85cfbb5a1 https://github.com/phpmyadmin/phpmyadmin/commit/20d0f08c587288698d813e22bd7b... Author: Marc Delisle marc@infomarc.info Date: 2014-12-03 (Wed, 03 Dec 2014)

Changed paths: M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

Log Message: ----------- Deactivate this test for now

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 41c02abc41049c4a23a08c4b05b3785ca9c0c3f1 https://github.com/phpmyadmin/phpmyadmin/commit/41c02abc41049c4a23a08c4b05b3... Author: Marc Delisle marc@infomarc.info Date: 2014-12-03 (Wed, 03 Dec 2014)

Changed paths: M ChangeLog M libraries/common.inc.php M libraries/plugins/AuthenticationPlugin.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php M url.php

Log Message: ----------- Merge branch 'MAINT_4_3_0' into QA_4_3

Commit: a23a49bf5a56dd134f2a0882672d304d5c196c81 https://github.com/phpmyadmin/phpmyadmin/commit/a23a49bf5a56dd134f2a0882672d... Author: josep constanti jconstanti@ovi.com Date: 2014-12-03 (Wed, 03 Dec 2014)

Changed paths: M po/ca.po

Log Message: ----------- Translated using Weblate (Catalan)

Currently translated at 83.7% (2495 of 2978 strings)

[CI skip]

Commit: 28d163f02c52128ee7449c44dbb9ed2a6cd6d581 https://github.com/phpmyadmin/phpmyadmin/commit/28d163f02c52128ee7449c44dbb9... Author: Weblate noreply@weblate.org Date: 2014-12-03 (Wed, 03 Dec 2014)

Changed paths: M ChangeLog M libraries/common.inc.php M libraries/plugins/AuthenticationPlugin.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php M url.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

Commit: 9591205e2cc7bb0d9100a74e6b5f7cb636b1051b https://github.com/phpmyadmin/phpmyadmin/commit/9591205e2cc7bb0d9100a74e6b5f... Author: Marc Delisle marc@infomarc.info Date: 2014-12-03 (Wed, 03 Dec 2014)

Changed paths: M ChangeLog M libraries/common.inc.php M url.php

Log Message: ----------- Fix merge conflict

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: be99b2d84522349c9750c72d064466bc16ac47c4 https://github.com/phpmyadmin/phpmyadmin/commit/be99b2d84522349c9750c72d0644... Author: Marc Delisle marc@infomarc.info Date: 2014-12-03 (Wed, 03 Dec 2014)

Log Message: ----------- Merge commit '28d163f'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9d13de4ead2e...be99b2d84522