[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 942f36: 4.2.13 release

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 942f366e71605bb423d786523ad086396cf62afb https://github.com/phpmyadmin/phpmyadmin/commit/942f366e71605bb423d786523ad… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-30 (Sun, 30 Nov 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.2.13 release Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: e9e3998949adbacf82b90e9d2061bf56e609a373 https://github.com/phpmyadmin/phpmyadmin/commit/e9e3998949adbacf82b90e9d206… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-11-30 (Sun, 30 Nov 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.2.13 release Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 9b2479b7216dd91a6cc2f231c0fd6b85d457f6e2 https://github.com/phpmyadmin/phpmyadmin/commit/9b2479b7216dd91a6cc2f231c0f… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-01 (Mon, 01 Dec 2014) Changed paths: M ChangeLog M url.php Log Message: ----------- bug #4612 [security] XSS vulnerability in redirection mechanism Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 1ac863c7573d12012374d5d41e5c7dc5505ea6e1 https://github.com/phpmyadmin/phpmyadmin/commit/1ac863c7573d12012374d5d41e5… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2014-12-02 (Tue, 02 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: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: a59ef664974c20b688261fcd4d77554fd1050cdf https://github.com/phpmyadmin/phpmyadmin/commit/a59ef664974c20b688261fcd4d7… Author: Marc Delisle <marc(a)infomarc.info> Date: 2014-12-03 (Wed, 03 Dec 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php Log Message: ----------- 4.2.13.1 release Signed-off-by: Marc Delisle <marc(a)infomarc.info> Commit: 94952f52dad9490b4260067b68183a6d8c893869 https://github.com/phpmyadmin/phpmyadmin/commit/94952f52dad9490b4260067b681… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- Adjust testcase to new split methods Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: f2a4b56afe4291513434db2f7b5541774d13f48b https://github.com/phpmyadmin/phpmyadmin/commit/f2a4b56afe4291513434db2f7b5… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php Log Message: ----------- Add missing call to test Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 4ac6b01e17c2e4a8183c0e5ae880b88959d1d85f https://github.com/phpmyadmin/phpmyadmin/commit/4ac6b01e17c2e4a8183c0e5ae88… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php 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_2_13' into QA_4_2 Conflicts: ChangeLog README doc/conf.py libraries/Config.class.php Commit: 72d2741f37c27a3e73aa36827fe5f8e73d351c4b https://github.com/phpmyadmin/phpmyadmin/commit/72d2741f37c27a3e73aa36827fe… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M po/hy.po Log Message: ----------- Adjust plurals equation Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 88cd689346757daf2e65c3344a8bf3df359b1225 https://github.com/phpmyadmin/phpmyadmin/commit/88cd689346757daf2e65c3344a8… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M po/hy.po Log Message: ----------- Merge branch 'MAINT_4_2_13' into QA_4_2 Commit: d7b0f0d4f9e0ac78a3a83aeee7cbf91c389d275d https://github.com/phpmyadmin/phpmyadmin/commit/d7b0f0d4f9e0ac78a3a83aeee7c… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml M build.xml M composer.json Log Message: ----------- Install phpunit using composer The pear channel is now disabled so our test fail. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 053cd7303131fa09c164b0ff84bb9bd59f087118 https://github.com/phpmyadmin/phpmyadmin/commit/053cd7303131fa09c164b0ff84b… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M .travis.yml M build.xml M composer.json Log Message: ----------- Merge branch 'MAINT_4_2_13' into QA_4_2 Commit: f8ed8422e64dfa153aded6c782db15d9e0cb383b https://github.com/phpmyadmin/phpmyadmin/commit/f8ed8422e64dfa153aded6c782d… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M po/hy.po Log Message: ----------- Revert "Adjust plurals equation" This reverts commit 72d2741f37c27a3e73aa36827fe5f8e73d351c4b. Commit: 7a41a4f325264b04fd11e28f975e0199cb5e95d2 https://github.com/phpmyadmin/phpmyadmin/commit/7a41a4f325264b04fd11e28f975… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M po/hy.po M po/uz.po Log Message: ----------- Fix syntax errors in po files Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c2ad99da2bf166de7e114e1e129ee435c9e23756 https://github.com/phpmyadmin/phpmyadmin/commit/c2ad99da2bf166de7e114e1e129… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M po/hy.po M po/uz.po Log Message: ----------- Merge branch 'MAINT_4_2_13' into QA_4_2 Commit: f5a99f5a6383b5bf892139e85f791a7dbccafc23 https://github.com/phpmyadmin/phpmyadmin/commit/f5a99f5a6383b5bf892139e85f7… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M scripts/generate-mo Log Message: ----------- Improve locales compiling - return correct error code on failure - try to compile all locales and report error for each failing - color error messages Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c4ffccd6e240ed70fd31fa085fe9469d267ef52d https://github.com/phpmyadmin/phpmyadmin/commit/c4ffccd6e240ed70fd31fa085fe… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M scripts/generate-mo Log Message: ----------- Merge branch 'MAINT_4_2_13' into QA_4_2 Commit: 67cade9d806e9b32b0cf35d5913f215bca2144b0 https://github.com/phpmyadmin/phpmyadmin/commit/67cade9d806e9b32b0cf35d5913… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M ChangeLog M libraries/relation.lib.php Log Message: ----------- Merge commit '19802ca9f9cb12c3dd9034a0928f2c417bf91d30' into MAINT_4_3_0 Commit: 357bd55571d3d2a48f285f7e8f4c7c26ad2dcfc1 https://github.com/phpmyadmin/phpmyadmin/commit/357bd55571d3d2a48f285f7e8f4… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Log Message: ----------- Merge commit 'e9e3998949adbacf82b90e9d2061bf56e609a373' into MAINT_4_3_0 Commit: 779c318313a540561c567ce9f66478df894dd339 https://github.com/phpmyadmin/phpmyadmin/commit/779c318313a540561c567ce9f66… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Log Message: ----------- Merge commit '942f366e71605bb423d786523ad086396cf62afb' into MAINT_4_3_0 Commit: 5bd1aca4aab1fee6c1afd0bb94284a302863fcff https://github.com/phpmyadmin/phpmyadmin/commit/5bd1aca4aab1fee6c1afd0bb942… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Log Message: ----------- Merge commit 'c2ad99da2bf166de7e114e1e129ee435c9e23756' into MAINT_4_3_0 Commit: 7e4baefbf066bbd3b63c85f3386af93dfe66067e https://github.com/phpmyadmin/phpmyadmin/commit/7e4baefbf066bbd3b63c85f3386… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M scripts/generate-mo Log Message: ----------- Merge branch 'QA_4_2' into MAINT_4_3_0 Commit: d19fe59438b346021a2d9c0e3def4a11d3aaf1b1 https://github.com/phpmyadmin/phpmyadmin/commit/d19fe59438b346021a2d9c0e3de… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M scripts/generate-mo Log Message: ----------- Merge branch 'MAINT_4_3_0' into QA_4_3 Commit: 6e9e9cc472bc0393fb897c2dc2eead2769d2f78c https://github.com/phpmyadmin/phpmyadmin/commit/6e9e9cc472bc0393fb897c2dc2e… Author: Michal Čihař <michal(a)cihar.com> Date: 2014-12-04 (Thu, 04 Dec 2014) Changed paths: M scripts/generate-mo Log Message: ----------- Merge branch 'QA_4_3' Conflicts: scripts/generate-mo Compare: https://github.com/phpmyadmin/phpmyadmin/compare/80daea0abf61...6e9e9cc472bc