Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5f0c55da4a69566061b9384f3487c3a741d96e29
      
https://github.com/phpmyadmin/phpmyadmin/commit/5f0c55da4a69566061b9384f3487c3a741d96e29
  Author: Yong Kim <k...@nhn.com>
  Date:   2015-12-07 (Mon, 07 Dec 2015)

  Changed paths:
    M po/ko.po

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

Currently translated at 77.9% (2503 of 3211 strings)

[CI skip]


  Commit: 39c97184e85b2c3a1076ff11e26df72d0a0fd1b8
      
https://github.com/phpmyadmin/phpmyadmin/commit/39c97184e85b2c3a1076ff11e26df72d0a0fd1b8
  Author: Weblate <nore...@weblate.org>
  Date:   2015-12-07 (Mon, 07 Dec 2015)

  Changed paths:
    M ChangeLog
    M js/export.js

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


  Commit: 8742209c6331befcf0c6df630328bcc7795a5e60
      
https://github.com/phpmyadmin/phpmyadmin/commit/8742209c6331befcf0c6df630328bcc7795a5e60
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2015-12-07 (Mon, 07 Dec 2015)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php
    M test/libraries/common/PMA_quoting_slashing_test.php

  Log Message:
  -----------
  Fix single quote export for servers in ANSI_QUOTES mode

It is possible to escape ' inside '' as both '' and \'. However using ''
is MySQL extension and does not work in ANSI mode. We need to generate
compatible exports in this case, so sticking with \' is safer.

Fixes #11721

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 62503612bdbc2613f41e3313bee0070513a58b8f
      
https://github.com/phpmyadmin/phpmyadmin/commit/62503612bdbc2613f41e3313bee0070513a58b8f
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2015-12-07 (Mon, 07 Dec 2015)

  Log Message:
  -----------
  Merge commit '39c97184e85b2c3a1076ff11e26df72d0a0fd1b8'


  Commit: b94318c4cdaed8e4cb25f80fc5bbfc9e821c9955
      
https://github.com/phpmyadmin/phpmyadmin/commit/b94318c4cdaed8e4cb25f80fc5bbfc9e821c9955
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2015-12-07 (Mon, 07 Dec 2015)

  Changed paths:
    M ChangeLog
    M libraries/Util.php
    M test/libraries/common/PMA_quoting_slashing_test.php

  Log Message:
  -----------
  Merge branch 'QA_4_5'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/d9bec7f08581...b94318c4cdae
_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

Reply via email to