[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 319aac: 4.2.10 release

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 319aac3c761142ab00e3e6016e594d4b84079efc
      https://github.com/phpmyadmin/phpmyadmin/commit/319aac3c761142ab00e3e6016e594d4b84079efc
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.10 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 27637d9ca0dd3d23b4db7f2d10761fbaf60e043a
      https://github.com/phpmyadmin/phpmyadmin/commit/27637d9ca0dd3d23b4db7f2d10761fbaf60e043a
  Author: julianladisch <github.com-t3if at ladisch.de>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M po/de.po

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

Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]


  Commit: ac27cd2026ec4ac0802d0ebf85f76ba317cb8bd7
      https://github.com/phpmyadmin/phpmyadmin/commit/ac27cd2026ec4ac0802d0ebf85f76ba317cb8bd7
  Author: Tor Stokkan <danorse at gmail.com>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M po/nb.po

  Log Message:
  -----------
  Translated using Weblate (Norwegian Bokmål)

Currently translated at 65.4% (1811 of 2768 strings)

[CI skip]


  Commit: e67abc737a5c2031eea635e4017cf297a330f80a
      https://github.com/phpmyadmin/phpmyadmin/commit/e67abc737a5c2031eea635e4017cf297a330f80a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

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

  Log Message:
  -----------
  Fix tests

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: af6e87f27885fe9b8008f3e63612508490799b29
      https://github.com/phpmyadmin/phpmyadmin/commit/af6e87f27885fe9b8008f3e63612508490799b29
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M po/ia.po

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

Currently translated at 62.4% (1728 of 2768 strings)

[CI skip]


  Commit: 331d89c0bcbaadd29ddac5db6c0ca35f6792a453
      https://github.com/phpmyadmin/phpmyadmin/commit/331d89c0bcbaadd29ddac5db6c0ca35f6792a453
  Author: Tor Stokkan <danorse at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M po/nb.po

  Log Message:
  -----------
  Translated using Weblate (Norwegian Bokmål)

Currently translated at 65.4% (1813 of 2768 strings)

[CI skip]


  Commit: 8186a0e462dbad074e8ec6fb90f14921ac095996
      https://github.com/phpmyadmin/phpmyadmin/commit/8186a0e462dbad074e8ec6fb90f14921ac095996
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

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

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


  Commit: bd68c54d1beeef79d237e8bfda44690834012a76
      https://github.com/phpmyadmin/phpmyadmin/commit/bd68c54d1beeef79d237e8bfda44690834012a76
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  bug #4562 [security] XSS in debug SQL output

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 7b8962dede7631298c81e2c1cd267b81f1e08a8c
      https://github.com/phpmyadmin/phpmyadmin/commit/7b8962dede7631298c81e2c1cd267b81f1e08a8c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js

  Log Message:
  -----------
  bug #4563 [security] XSS in monitor query analyzer

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: d0e3ab3bc9da5a4ed24e485632471fef65cdb556
      https://github.com/phpmyadmin/phpmyadmin/commit/d0e3ab3bc9da5a4ed24e485632471fef65cdb556
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.10.1 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: b75e19f8df919144a3febd21b0a3098e89d41ff6
      https://github.com/phpmyadmin/phpmyadmin/commit/b75e19f8df919144a3febd21b0a3098e89d41ff6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Log Message:
  -----------
  Merge commit '319aac3' into QA_4_2


  Commit: 873ffa3ffed233754b69ba5df7a2ee3d8ea0025f
      https://github.com/phpmyadmin/phpmyadmin/commit/873ffa3ffed233754b69ba5df7a2ee3d8ea0025f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js
    M libraries/DatabaseInterface.class.php

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

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: d8d4a8062aea09023d3950691a5a8ce1312ab1a4
      https://github.com/phpmyadmin/phpmyadmin/commit/d8d4a8062aea09023d3950691a5a8ce1312ab1a4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Log Message:
  -----------
  Merge commit 'd0e3ab3' into QA_4_2


  Commit: 83e322352401cbe18c6674dd489a1a3704466820
      https://github.com/phpmyadmin/phpmyadmin/commit/83e322352401cbe18c6674dd489a1a3704466820
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Log Message:
  -----------
  Merge commit '8186a0e'


  Commit: 1ca706fd1ec74f88aa61ed4345c9be0617ca3486
      https://github.com/phpmyadmin/phpmyadmin/commit/1ca706fd1ec74f88aa61ed4345c9be0617ca3486
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Log Message:
  -----------
  Merge commit '319aac3'


  Commit: dde9ca7c7911868251776d4c42ee4f7ba70cd872
      https://github.com/phpmyadmin/phpmyadmin/commit/dde9ca7c7911868251776d4c42ee4f7ba70cd872
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Fix merge conflicts

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: b906e511128d19107be04f44a1343099f834a1bc
      https://github.com/phpmyadmin/phpmyadmin/commit/b906e511128d19107be04f44a1343099f834a1bc
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Log Message:
  -----------
  Merge commit 'd8d4a80'


  Commit: 387f6aa273541d04fdbc69a0bacd5df442d1bfd4
      https://github.com/phpmyadmin/phpmyadmin/commit/387f6aa273541d04fdbc69a0bacd5df442d1bfd4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M po/cs.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a00cc2b10617...387f6aa27354