[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1832c8: ReCaptcha feature

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1832c8fa33a93a7c035eafde8b96c568d732c3b0
      https://github.com/phpmyadmin/phpmyadmin/commit/1832c8fa33a93a7c035eafde8b96c568d732c3b0
  Author: Bojan Petkovski <p.bojan at live.com>
  Date:   2013-05-11 (Sat, 11 May 2013)

  Changed paths:
    M doc/config.rst
    M libraries/Header.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    A libraries/plugins/auth/recaptchalib.php

  Log Message:
  -----------
  ReCaptcha feature


  Commit: ab55c635e62dbc074673e06f56c008f180883884
      https://github.com/phpmyadmin/phpmyadmin/commit/ab55c635e62dbc074673e06f56c008f180883884
  Author: Bojan Petkovski <p.bojan at live.com>
  Date:   2013-05-11 (Sat, 11 May 2013)

  Changed paths:
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php

  Log Message:
  -----------
  ReCaptcha config from setup script

Added config setting to be available from the ./setup script. Captcha
public and private keys are added in the Features->Security tab, the
captchaLogin is available in the New Server tab where you can enable or
disable reCaptcha for that server.


  Commit: e9f5a30ae564cfd8301bda6677c5a5406103210b
      https://github.com/phpmyadmin/phpmyadmin/commit/e9f5a30ae564cfd8301bda6677c5a5406103210b
  Author: Bojan Petkovski <p.bojan at live.com>
  Date:   2013-05-11 (Sat, 11 May 2013)

  Changed paths:
    M libraries/Header.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  ReCaptcha https and CSP bug fixes


  Commit: 4213c3c2852f14814d5a683ae3916e485296e13a
      https://github.com/phpmyadmin/phpmyadmin/commit/4213c3c2852f14814d5a683ae3916e485296e13a
  Author: Bojan Petkovski <p.bojan at live.com>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  ReCaptcha error message


  Commit: 95f5df348d8f7693c2171992e44ced1cc00d6d71
      https://github.com/phpmyadmin/phpmyadmin/commit/95f5df348d8f7693c2171992e44ced1cc00d6d71
  Author: Bojan Petkovski <p.bojan at live.com>
  Date:   2013-05-20 (Mon, 20 May 2013)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Recaptcha bug fixes

Error message for empty captcha "Please enter correct captcha!" and if
the user enters correct captcha but wrong login data it won't be
required to enter it next time.


  Commit: ba4e4f7eaf808e25b895dd6b42879440f7e8a15b
      https://github.com/phpmyadmin/phpmyadmin/commit/ba4e4f7eaf808e25b895dd6b42879440f7e8a15b
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M libraries/mysql_charsets.lib.php

  Log Message:
  -----------
  Add name for utf8mb4


  Commit: 65a083f6d467e641110a42df463ca14631bbae50
      https://github.com/phpmyadmin/phpmyadmin/commit/65a083f6d467e641110a42df463ca14631bbae50
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M doc/config.rst
    M libraries/Header.class.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    A libraries/plugins/auth/recaptchalib.php

  Log Message:
  -----------
  Merge branch 'RECAPTCHA2' of git://github.com/pbojan/phpmyadmin into pbojan-RECAPTCHA2

Conflicts:
	libraries/Header.class.php


  Commit: d08730780a0d364a2c0c7b96312efc890c0f9a12
      https://github.com/phpmyadmin/phpmyadmin/commit/d08730780a0d364a2c0c7b96312efc890c0f9a12
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M doc/config.rst
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Consistent config naming with other config options (issue #369)


  Commit: 5936f6148694a192feeca2f25a287791f805e5c4
      https://github.com/phpmyadmin/phpmyadmin/commit/5936f6148694a192feeca2f25a287791f805e5c4
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M doc/config.rst

  Log Message:
  -----------
  Missing crossreferences in captcha doc (issue #369)


  Commit: e9f7faa6d318a790ca38eabbb04ee31822572493
      https://github.com/phpmyadmin/phpmyadmin/commit/e9f7faa6d318a790ca38eabbb04ee31822572493
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M doc/setup.rst

  Log Message:
  -----------
  Add hint to captcha in security tips


  Commit: 9e523947e550b3a0238434e78d3ef32fdcfa2cff
      https://github.com/phpmyadmin/phpmyadmin/commit/9e523947e550b3a0238434e78d3ef32fdcfa2cff
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog entry


  Commit: 7c3a48204919381bba37f86c7eed03aa46cde244
      https://github.com/phpmyadmin/phpmyadmin/commit/7c3a48204919381bba37f86c7eed03aa46cde244
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M po/si.po
    M po/sk.po
    M test/classes/navigation/PMA_Node_Column_test.php
    M test/classes/navigation/PMA_Node_test.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5e3793cb6699...7c3a48204919