Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 15204ab22722c3ca33c83c18d53d7e937cb6fe91
https://github.com/phpmyadmin/phpmyadmin/commit/15204ab22722c3ca33c83c18d53…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
A libraries/plugins/auth/recaptcha/autoload.php
R libraries/plugins/auth/recaptcha/recaptchalib.php
Log Message:
-----------
Fix #11389 ReCaptcha produce deprecated messages under PHP 7
Upgrade ReCaptcha library to version 1.1.1
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: bcf80395097bb62cf745516eb9b4b4b1b9b29e13
https://github.com/phpmyadmin/phpmyadmin/commit/bcf80395097bb62cf745516eb9b…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
A libraries/plugins/auth/recaptcha/autoload.php
R libraries/plugins/auth/recaptcha/recaptchalib.php
Log Message:
-----------
Merge pull request #11390 from madhuracj/recaptcha
Fix #11389 ReCaptcha produce deprecated messages under PHP 7
Commit: 5bf03ef3e728917f6532f30302ed3ab7d5dda16e
https://github.com/phpmyadmin/phpmyadmin/commit/5bf03ef3e728917f6532f30302e…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
A libraries/plugins/auth/recaptcha/autoload.php
R libraries/plugins/auth/recaptcha/recaptchalib.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e13e30e17278...5bf03ef3e728
Branch: refs/heads/QA_4_4
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 0f286c0854d7d55d7f86d53e90122adccbd12778
https://github.com/phpmyadmin/phpmyadmin/commit/0f286c0854d7d55d7f86d53e901…
Author: Andrey Aleksanyants <aaleksanyants(a)yahoo.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M po/hy.po
Log Message:
-----------
Translated using Weblate (Armenian)
Currently translated at 50.8% (1546 of 3040 strings)
[CI skip]
Commit: 1c765f33490f780709e7c9e46c651c788fb6ff6f
https://github.com/phpmyadmin/phpmyadmin/commit/1c765f33490f780709e7c9e46c6…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M po/cs.po
Log Message:
-----------
Translated using Weblate (Czech)
Currently translated at 98.1% (2984 of 3040 strings)
[CI skip]
Commit: 5f8b998654a83e2f03278f68695d13a43aed7871
https://github.com/phpmyadmin/phpmyadmin/commit/5f8b998654a83e2f03278f68695…
Author: Lari Oesch <lari(a)oesch.me>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M po/fi.po
Log Message:
-----------
Translated using Weblate (Finnish)
Currently translated at 63.1% (1921 of 3040 strings)
[CI skip]
Commit: 224462063b99e27a254a4761f2d078d02452d891
https://github.com/phpmyadmin/phpmyadmin/commit/224462063b99e27a254a4761f2d…
Author: Weblate <noreply(a)weblate.org>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
A libraries/plugins/auth/recaptcha/autoload.php
R libraries/plugins/auth/recaptcha/recaptchalib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/bcf80395097b...224462063b99
Branch: refs/heads/QA_4_4
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 15204ab22722c3ca33c83c18d53d7e937cb6fe91
https://github.com/phpmyadmin/phpmyadmin/commit/15204ab22722c3ca33c83c18d53…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
A libraries/plugins/auth/recaptcha/autoload.php
R libraries/plugins/auth/recaptcha/recaptchalib.php
Log Message:
-----------
Fix #11389 ReCaptcha produce deprecated messages under PHP 7
Upgrade ReCaptcha library to version 1.1.1
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: bcf80395097bb62cf745516eb9b4b4b1b9b29e13
https://github.com/phpmyadmin/phpmyadmin/commit/bcf80395097bb62cf745516eb9b…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M libraries/plugins/auth/AuthenticationCookie.class.php
A libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
A libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
A libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
A libraries/plugins/auth/recaptcha/autoload.php
R libraries/plugins/auth/recaptcha/recaptchalib.php
Log Message:
-----------
Merge pull request #11390 from madhuracj/recaptcha
Fix #11389 ReCaptcha produce deprecated messages under PHP 7
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/12fa1e648113...bcf80395097b
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 7bc910c3062bcd29b8719a3962c96dfe9f59fde8
https://github.com/phpmyadmin/phpmyadmin/commit/7bc910c3062bcd29b8719a3962c…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/eo.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/ia.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/km.po
M po/kn.po
M po/ko.po
M po/ksh.po
M po/ky.po
M po/li.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/ne.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/vi.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
[CI skip]
Signed-off-by: Marc Delisle <marc(a)infomarc.info>