[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dac317: Bug-4388 Disable database expansion when enabled t...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: dac31757cf23d3aa1c2d92ce1ab6f221d2ccb230
      https://github.com/phpmyadmin/phpmyadmin/commit/dac31757cf23d3aa1c2d92ce1ab6f221d2ccb230
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Bug-4388 Disable database expansion when enabled throws Error 500

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 00d1d9c2928586b3392e9c661057bfa2c94ffac9
      https://github.com/phpmyadmin/phpmyadmin/commit/00d1d9c2928586b3392e9c661057bfa2c94ffac9
  Author: Erwin Bronkhorst <erwinbronkhorst at yahoo.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 100.0% (2768 of 2768)


  Commit: 1a901987a3e0b3a18e7c92d39e307cd76592b428
      https://github.com/phpmyadmin/phpmyadmin/commit/1a901987a3e0b3a18e7c92d39e307cd76592b428
  Author: Marcin Kozioł <lord_dark at wp.pl>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M po/pl.po

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

Currently translated at 94.7% (2624 of 2768)


  Commit: 06c57c48201bc67e7f6b31e47838bb00ead32558
      https://github.com/phpmyadmin/phpmyadmin/commit/06c57c48201bc67e7f6b31e47838bb00ead32558
  Author: Júlio Sebastião <j38600 at gmail.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M po/pt.po

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

Currently translated at 63.2% (1751 of 2768)


  Commit: 78c2022199b28d5cd4ddeca531fc6e8af339f0bc
      https://github.com/phpmyadmin/phpmyadmin/commit/78c2022199b28d5cd4ddeca531fc6e8af339f0bc
  Author: Weblate <noreply at weblate.org>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M ChangeLog

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


  Commit: 3d98d33037963d0b2bf629b0451facf7210945c5
      https://github.com/phpmyadmin/phpmyadmin/commit/3d98d33037963d0b2bf629b0451facf7210945c5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Merge pull request #1167 from D-storm/bug-4388

Bug-4388 Disable database expansion when enabled throws Error 500


  Commit: 3ba9fef03ce13306b2c21f764073161f5a13fc3c
      https://github.com/phpmyadmin/phpmyadmin/commit/3ba9fef03ce13306b2c21f764073161f5a13fc3c
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 100.0% (2768 of 2768)


  Commit: 0d4c91ba33675fa94a722c3299e76b93c8d0aae8
      https://github.com/phpmyadmin/phpmyadmin/commit/0d4c91ba33675fa94a722c3299e76b93c8d0aae8
  Author: Weblate <noreply at weblate.org>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M js/navigation.js

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


  Commit: cf743642a860b01b2561b71e7a0336df864e18f6
      https://github.com/phpmyadmin/phpmyadmin/commit/cf743642a860b01b2561b71e7a0336df864e18f6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

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


  Commit: 1deac8fa43e836a134dc2e856583909c491777ef
      https://github.com/phpmyadmin/phpmyadmin/commit/1deac8fa43e836a134dc2e856583909c491777ef
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M po/nl.po

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


  Commit: c8294ac3d41e63b0500fa35ff2798fbf8db83a93
      https://github.com/phpmyadmin/phpmyadmin/commit/c8294ac3d41e63b0500fa35ff2798fbf8db83a93
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Merge commit 'dac3175'


  Commit: 095f6ad235dd2dfb978f1e7dc6283e2ffa78283f
      https://github.com/phpmyadmin/phpmyadmin/commit/095f6ad235dd2dfb978f1e7dc6283e2ffa78283f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Log Message:
  -----------
  Merge commit '0d4c91b'


  Commit: 0e339dcb6486e493b41f3323b6c13135bb4c7af3
      https://github.com/phpmyadmin/phpmyadmin/commit/0e339dcb6486e493b41f3323b6c13135bb4c7af3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge commit 'cf74364'


  Commit: ba2ebe2d6c4cbac008ce0cab8f2c15bdaa6d3373
      https://github.com/phpmyadmin/phpmyadmin/commit/ba2ebe2d6c4cbac008ce0cab8f2c15bdaa6d3373
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-14 (Wed, 14 May 2014)

  Log Message:
  -----------
  Merge commit '1deac8f'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f334b61242f8...ba2ebe2d6c4c