[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4781c3: Merge branch 'MAINT_4_0_3' into QA_4_0

Marc Delisle marc at infomarc.info
Mon Jun 17 18:37:40 CEST 2013


  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4781c3e10585fd27fc5892129288773da4e081fe
      https://github.com/phpmyadmin/phpmyadmin/commit/4781c3e10585fd27fc5892129288773da4e081fe
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Log Message:
  -----------
  Merge branch 'MAINT_4_0_3' into QA_4_0


  Commit: 961515d50b20b9f640bb8f8486b0ee9771ad004d
      https://github.com/phpmyadmin/phpmyadmin/commit/961515d50b20b9f640bb8f8486b0ee9771ad004d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-05-31 (Fri, 31 May 2013)

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

  Log Message:
  -----------
  4.0.4-dev


  Commit: 357feda357541cca963c73d84e12e0c4b63a8dcd
      https://github.com/phpmyadmin/phpmyadmin/commit/357feda357541cca963c73d84e12e0c4b63a8dcd
  Author: Yuri German <yuri198 at gmail.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M po/he.po

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

Currently translated at 23.2% (604 of 2602)


  Commit: b05adabc4575331568ab31ab7758e16aaabf3bed
      https://github.com/phpmyadmin/phpmyadmin/commit/b05adabc4575331568ab31ab7758e16aaabf3bed
  Author: Weblate <noreply at weblate.org>
  Date:   2013-05-31 (Fri, 31 May 2013)

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

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


  Commit: 56e202a6f57fff1ddefa218a91cd0e67f4a88021
      https://github.com/phpmyadmin/phpmyadmin/commit/56e202a6f57fff1ddefa218a91cd0e67f4a88021
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click


  Commit: 0757601a42f10111c289fed58dcc4049675a1b9a
      https://github.com/phpmyadmin/phpmyadmin/commit/0757601a42f10111c289fed58dcc4049675a1b9a
  Author: Aputsiaq Niels Janussen <aj at isit.gl>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M po/da.po

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

Currently translated at 100.0% (2602 of 2602)


  Commit: 34a92464996b336c12a51e3d6bb195aa7fc57acc
      https://github.com/phpmyadmin/phpmyadmin/commit/34a92464996b336c12a51e3d6bb195aa7fc57acc
  Author: Yuri German <yuri198 at gmail.com>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M po/he.po

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

Currently translated at 23.6% (615 of 2602)


  Commit: 72275ecbb8f144500517903a4a43e5f97b9bcaf2
      https://github.com/phpmyadmin/phpmyadmin/commit/72275ecbb8f144500517903a4a43e5f97b9bcaf2
  Author: Kyeong Su Shin <ksshin at uwaterloo.ca>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M po/ko.po

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

Currently translated at 67.3% (1752 of 2602)


  Commit: 7dffcc8f8e203c8443aa8393504a7b154b86d620
      https://github.com/phpmyadmin/phpmyadmin/commit/7dffcc8f8e203c8443aa8393504a7b154b86d620
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/navigation/Nodes/Node_Database.class.php

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


  Commit: 254ecc3094d95d09aaeb528fa601e11a67c7e8bf
      https://github.com/phpmyadmin/phpmyadmin/commit/254ecc3094d95d09aaeb528fa601e11a67c7e8bf
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M js/tbl_select.js

  Log Message:
  -----------
  Fix typo


  Commit: d2e217160b438a3beba78cd3d72122b8dd587168
      https://github.com/phpmyadmin/phpmyadmin/commit/d2e217160b438a3beba78cd3d72122b8dd587168
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-02 (Sun, 02 Jun 2013)

  Changed paths:
    M ChangeLog
    M index.php

  Log Message:
  -----------
  bug #3961 Avoid Suhosin warning when in simulation mode


  Commit: 26e805a42d26cf147f21a5dd0f92c72e77f26468
      https://github.com/phpmyadmin/phpmyadmin/commit/26e805a42d26cf147f21a5dd0f92c72e77f26468
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M po/he.po

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

Currently translated at 23.6% (615 of 2602)


  Commit: 91ecb0bf1e05c7446cff4d16d972b28b66846d99
      https://github.com/phpmyadmin/phpmyadmin/commit/91ecb0bf1e05c7446cff4d16d972b28b66846d99
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/structure.lib.php

  Log Message:
  -----------
  Use sentence case for "Row statistics"


  Commit: 14898dcac9a4a43cd995a2aa28b54e6393aeaeae
      https://github.com/phpmyadmin/phpmyadmin/commit/14898dcac9a4a43cd995a2aa28b54e6393aeaeae
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M libraries/structure.lib.php

  Log Message:
  -----------
  Alternating row color problem


  Commit: 7120b08408723367420c803f78bdf7a3b671abae
      https://github.com/phpmyadmin/phpmyadmin/commit/7120b08408723367420c803f78bdf7a3b671abae
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M libraries/structure.lib.php

  Log Message:
  -----------
  Display the unit of Row length


  Commit: 68d57f0c3acd61f2c065117726fd325a94b7f629
      https://github.com/phpmyadmin/phpmyadmin/commit/68d57f0c3acd61f2c065117726fd325a94b7f629
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at 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/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.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/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/ko.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/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 at 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 at latin.po
    M po/zh_CN.po
    M po/zh_TW.po

  Log Message:
  -----------
  Update po files


  Commit: a8c2850c6eae8e7b7cb67aafb9031fdbb2f4f463
      https://github.com/phpmyadmin/phpmyadmin/commit/a8c2850c6eae8e7b7cb67aafb9031fdbb2f4f463
  Author: Panagiotis Papazoglou <papaz_p at yahoo.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M po/el.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: c55dfb4355dfc3b4d68d37147951e0ee41c6b135
      https://github.com/phpmyadmin/phpmyadmin/commit/c55dfb4355dfc3b4d68d37147951e0ee41c6b135
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M po/fr.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: 3c69f5299b195c50063a08c1db0efcdebbc990d9
      https://github.com/phpmyadmin/phpmyadmin/commit/3c69f5299b195c50063a08c1db0efcdebbc990d9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M po/cs.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: a7d46066f147e4c06cbedaea99ada0e346457df7
      https://github.com/phpmyadmin/phpmyadmin/commit/a7d46066f147e4c06cbedaea99ada0e346457df7
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: b8a621629f4c6cd53b9820c98551eb605429774f
      https://github.com/phpmyadmin/phpmyadmin/commit/b8a621629f4c6cd53b9820c98551eb605429774f
  Author: Matías Bellone <matiasbellone+weblate at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M po/es.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: 9afc2fba5767459101e81c9a37459ab64cceb602
      https://github.com/phpmyadmin/phpmyadmin/commit/9afc2fba5767459101e81c9a37459ab64cceb602
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M libraries/common.inc.php

  Log Message:
  -----------
  Add check for json module in PHP

Debian no longer ships JSON support built in into PHP because of some
licensing issues found in the PHP 5.5 and others might follow, so we
need to check whether JSON module is there.


  Commit: 5df0726954306407beab5f74391d9e89508acfe6
      https://github.com/phpmyadmin/phpmyadmin/commit/5df0726954306407beab5f74391d9e89508acfe6
  Author: Anders Jonsson <jonars03 at student.umu.se>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M po/sv.po

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

Currently translated at 99.9% (2601 of 2603)


  Commit: ac6ed91fc732644065d7dccfbf56bbedd76d853c
      https://github.com/phpmyadmin/phpmyadmin/commit/ac6ed91fc732644065d7dccfbf56bbedd76d853c
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M libraries/common.inc.php

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


  Commit: 7a3c15724ab86af78f2f2475cfaea0470ab0f073
      https://github.com/phpmyadmin/phpmyadmin/commit/7a3c15724ab86af78f2f2475cfaea0470ab0f073
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ChangeLog
    M sql.php

  Log Message:
  -----------
  fix bug #3966, only display 'table has no unique column' when table is defined


  Commit: e12ee0519e58bb0513edcd3c8df187e119abc3cd
      https://github.com/phpmyadmin/phpmyadmin/commit/e12ee0519e58bb0513edcd3c8df187e119abc3cd
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: 0ed704c7b85a17bb596e1ca6740bef29bb1ec0c8
      https://github.com/phpmyadmin/phpmyadmin/commit/0ed704c7b85a17bb596e1ca6740bef29bb1ec0c8
  Author: Domen <dbc334 at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M po/sl.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: eb29af585aa2a8a6f731778e859e19869fdf5366
      https://github.com/phpmyadmin/phpmyadmin/commit/eb29af585aa2a8a6f731778e859e19869fdf5366
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M doc/config.rst
    M libraries/Header.class.php
    M libraries/config.default.php

  Log Message:
  -----------
  Allow customization of CSP headers

This is useful for inserting custom javascript in header/footer files.


  Commit: 77330abaef0e77c9b249d5dddeb9517d9657d9a7
      https://github.com/phpmyadmin/phpmyadmin/commit/77330abaef0e77c9b249d5dddeb9517d9657d9a7
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M libraries/Header.class.php

  Log Message:
  -----------
  Allow CSP for images as well


  Commit: bad0352e0382fc5df7013298849918dea3e6eae6
      https://github.com/phpmyadmin/phpmyadmin/commit/bad0352e0382fc5df7013298849918dea3e6eae6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Log Message:
  -----------
  Merge branch 'MAINT_4_0_3' into QA_4_0


  Commit: 773c5312d99ae761708fd2b24c652029a9d0f39a
      https://github.com/phpmyadmin/phpmyadmin/commit/773c5312d99ae761708fd2b24c652029a9d0f39a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M ChangeLog

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


  Commit: ae976ff6c051d1c50883f9038cf270045d3af83f
      https://github.com/phpmyadmin/phpmyadmin/commit/ae976ff6c051d1c50883f9038cf270045d3af83f
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M po/nl.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: eb12fe41a7e7a98b6a76d20978b06b7fa5507e0f
      https://github.com/phpmyadmin/phpmyadmin/commit/eb12fe41a7e7a98b6a76d20978b06b7fa5507e0f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M ChangeLog
    M doc/config.rst

  Log Message:
  -----------
  bug #3960 NavigationBarIconic config not honored


  Commit: 82b20393ad6a095cf60d3a61c9dd817e640670a5
      https://github.com/phpmyadmin/phpmyadmin/commit/82b20393ad6a095cf60d3a61c9dd817e640670a5
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M po/nl.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: c91bc8c911fc488f14d9b32cb4bafbdccf8117a2
      https://github.com/phpmyadmin/phpmyadmin/commit/c91bc8c911fc488f14d9b32cb4bafbdccf8117a2
  Author: Dadan Setia <da2n_s at yahoo.co.id>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M po/id.po

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

Currently translated at 74.2% (1932 of 2603)


  Commit: edcda5a3642c2b45f28c360a275f57b34b0de525
      https://github.com/phpmyadmin/phpmyadmin/commit/edcda5a3642c2b45f28c360a275f57b34b0de525
  Author: Yungu Kim <crimsonpi at gmail.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M po/ko.po

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

Currently translated at 67.3% (1752 of 2603)


  Commit: d550ae54b21d2130aa158062b3eb72cb2f133985
      https://github.com/phpmyadmin/phpmyadmin/commit/d550ae54b21d2130aa158062b3eb72cb2f133985
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M ChangeLog
    M doc/config.rst

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


  Commit: 46d0c481219a2c74865726abb76d31ecbabf4825
      https://github.com/phpmyadmin/phpmyadmin/commit/46d0c481219a2c74865726abb76d31ecbabf4825
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/select_lang.lib.php

  Log Message:
  -----------
  bug #3965 Default language wrong with zh-TW


  Commit: a4a08f28b88f4bf816654e6d8b5cd198a6f4fc22
      https://github.com/phpmyadmin/phpmyadmin/commit/a4a08f28b88f4bf816654e6d8b5cd198a6f4fc22
  Author: Spartak Ferrollari <spartakx at gmail.com>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M po/sq.po

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

Currently translated at 30.5% (793 of 2603)


  Commit: 9cf979a6f734800ae3bcc6948df181c7a9905937
      https://github.com/phpmyadmin/phpmyadmin/commit/9cf979a6f734800ae3bcc6948df181c7a9905937
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/select_lang.lib.php

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


  Commit: 0566bbeedd443dc0a7894ac39c3c67ac6be9a968
      https://github.com/phpmyadmin/phpmyadmin/commit/0566bbeedd443dc0a7894ac39c3c67ac6be9a968
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M test/libraries/select_lang/PMA_langDetails_test.php

  Log Message:
  -----------
  Forgot to fix the test


  Commit: a5839bf23649f8c927d02d9d09b977e7fbbc70c3
      https://github.com/phpmyadmin/phpmyadmin/commit/a5839bf23649f8c927d02d9d09b977e7fbbc70c3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M libraries/Menu.class.php

  Log Message:
  -----------
  Start to fix bug #3921


  Commit: 50e01992067b2401310688da027a10ee652fd61d
      https://github.com/phpmyadmin/phpmyadmin/commit/50e01992067b2401310688da027a10ee652fd61d
  Author: Pl P <plamen_mbx at yahoo.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M po/bg.po

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

Currently translated at 76.8% (1998 of 2603)


  Commit: 168fa47420b921e7fb3c2430c5dbb04e71b26b3b
      https://github.com/phpmyadmin/phpmyadmin/commit/168fa47420b921e7fb3c2430c5dbb04e71b26b3b
  Author: Yungu Kim <crimsonpi at gmail.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M po/ko.po

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

Currently translated at 69.0% (1795 of 2603)


  Commit: f94103628de72414f28065a1643055fb93e11856
      https://github.com/phpmyadmin/phpmyadmin/commit/f94103628de72414f28065a1643055fb93e11856
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M libraries/Menu.class.php

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


  Commit: 30e0e3648d90f349a119d9f53c94230fb7675210
      https://github.com/phpmyadmin/phpmyadmin/commit/30e0e3648d90f349a119d9f53c94230fb7675210
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M ChangeLog
    M index.php
    M libraries/Menu.class.php

  Log Message:
  -----------
  bug #3921 Call to undefined function PMA_isSuperuser() if default server is not set


  Commit: b7844a15043dbfaa01d47cb47a8f4a8fe42ebbf2
      https://github.com/phpmyadmin/phpmyadmin/commit/b7844a15043dbfaa01d47cb47a8f4a8fe42ebbf2
  Author: Yungu Kim <crimsonpi at gmail.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M po/ko.po

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

Currently translated at 69.0% (1797 of 2603)


  Commit: c0617905252f14270ad9d98d34dac0e97bb21a43
      https://github.com/phpmyadmin/phpmyadmin/commit/c0617905252f14270ad9d98d34dac0e97bb21a43
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M ChangeLog
    M index.php
    M libraries/Menu.class.php

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


  Commit: 70a3d4ac472e5543e7c1cb60facf204b31220e5b
      https://github.com/phpmyadmin/phpmyadmin/commit/70a3d4ac472e5543e7c1cb60facf204b31220e5b
  Author: Rodrigo Souza <rodrigo.chrome at outlook.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M po/pt_BR.po

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

Currently translated at 100.0% (2603 of 2603)


  Commit: b5089cf908a1c506546f43482fe2e836836a81cb
      https://github.com/phpmyadmin/phpmyadmin/commit/b5089cf908a1c506546f43482fe2e836836a81cb
  Author: Rouslan Placella <rouslan at placella.com>
  Date:   2013-06-09 (Sun, 09 Jun 2013)

  Changed paths:
    M ChangeLog
    M js/ajax.js

  Log Message:
  -----------
  bug #3971 Ctrl/shift + click opens links in same window


  Commit: 8f61a48478c03bfc6005b6f8b45c8d62b414b258
      https://github.com/phpmyadmin/phpmyadmin/commit/8f61a48478c03bfc6005b6f8b45c8d62b414b258
  Author: Ghanshyam Bagul <ghanshyambagul at gmail.com>
  Date:   2013-06-09 (Sun, 09 Jun 2013)

  Changed paths:
    M po/hi.po

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

Currently translated at 57.0% (1483 of 2603)


  Commit: a2593c0c939aaa00061112089b7f8c462bb4919c
      https://github.com/phpmyadmin/phpmyadmin/commit/a2593c0c939aaa00061112089b7f8c462bb4919c
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-09 (Sun, 09 Jun 2013)

  Changed paths:
    M ChangeLog
    M js/ajax.js

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


  Commit: 1ac9560aa70b2d7596a0345d2b5bdcb77082be1f
      https://github.com/phpmyadmin/phpmyadmin/commit/1ac9560aa70b2d7596a0345d2b5bdcb77082be1f
  Author: J.M <me at mynetx.net>
  Date:   2013-06-09 (Sun, 09 Jun 2013)

  Changed paths:
    M import_status.php

  Log Message:
  -----------
  Update session upload progress bug comment in import_status.php


  Commit: 063a2d9937c4dbd8a650eed9318967b17f5346b6
      https://github.com/phpmyadmin/phpmyadmin/commit/063a2d9937c4dbd8a650eed9318967b17f5346b6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M ChangeLog
    M doc/faq.rst
    M libraries/display_import_ajax.lib.php

  Log Message:
  -----------
  bug #3964 Import using https does not work


  Commit: 3215d68c240d12de30ac8342a5cf326b1a15bb2f
      https://github.com/phpmyadmin/phpmyadmin/commit/3215d68c240d12de30ac8342a5cf326b1a15bb2f
  Author: Dadan Setia <da2n_s at yahoo.co.id>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M po/id.po

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

Currently translated at 74.8% (1946 of 2603)


  Commit: 9b414c002563a9d6e742ab726c8a85f103595db7
      https://github.com/phpmyadmin/phpmyadmin/commit/9b414c002563a9d6e742ab726c8a85f103595db7
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M ChangeLog
    M doc/faq.rst
    M libraries/display_import_ajax.lib.php

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


  Commit: 0181fa9400482b0bc35d38384c321e078e4cb133
      https://github.com/phpmyadmin/phpmyadmin/commit/0181fa9400482b0bc35d38384c321e078e4cb133
  Author: Kari Söderholm <haprog at haprogszone.net>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportExcel.class.php

  Log Message:
  -----------
  Fix regression: Missing removeCRLF option in ExportCsv and ExportExcel plugins.


  Commit: 0a13fa1938a3da3fefa9c7dfcb8761ba77004aa8
      https://github.com/phpmyadmin/phpmyadmin/commit/0a13fa1938a3da3fefa9c7dfcb8761ba77004aa8
  Author: Kari Söderholm <haprog at haprogszone.net>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M export.php

  Log Message:
  -----------
  Fix missing post params in export.php for removeCRLF option in ExportCsv
and ExportExcel plugins.

This is needed after commit a564d981e9ef5022d69b2720d6a6126c73c74637


  Commit: be6d6733d9fc99f125e6ab0c893c604ec2845aa8
      https://github.com/phpmyadmin/phpmyadmin/commit/be6d6733d9fc99f125e6ab0c893c604ec2845aa8
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for pull request 409


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

  Changed paths:
    M libraries/error.inc.php

  Log Message:
  -----------
  Disable response wrapper in fatal error path

There might be some critical pieces (eg. json, pcre or session) missing
and there is no way to make Response class working at this point.

Fixes #3981


  Commit: a019f7e7b7f5b92982af2f54c23d4d5fb8348719
      https://github.com/phpmyadmin/phpmyadmin/commit/a019f7e7b7f5b92982af2f54c23d4d5fb8348719
  Author: Dadan Setia <da2n_s at yahoo.co.id>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M po/id.po

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

Currently translated at 74.8% (1947 of 2603)


  Commit: 207f04a1d73447c7a9e56a4df46a31635bc41832
      https://github.com/phpmyadmin/phpmyadmin/commit/207f04a1d73447c7a9e56a4df46a31635bc41832
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-10 (Mon, 10 Jun 2013)

  Changed paths:
    M libraries/error.inc.php

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


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

  Changed paths:
    M libraries/relation.lib.php

  Log Message:
  -----------
  Fixed formatting of documentation URL (can contain %, so it can not be used as format string)


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

  Changed paths:
    M ChangeLog
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    R libraries/schema/Visio_Relation_Schema.class.php

  Log Message:
  -----------
  bug #3631 Drop not working Visio schema export.


  Commit: 29519cb165d94f7e6984a53d668074e9468b3dc2
      https://github.com/phpmyadmin/phpmyadmin/commit/29519cb165d94f7e6984a53d668074e9468b3dc2
  Author: Peter Rosa <peter.rosa at pro.sk>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M po/sk.po

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

Currently translated at 76.1% (1981 of 2603)


  Commit: b369f6a91218998b80f5558d3adab8a118a96388
      https://github.com/phpmyadmin/phpmyadmin/commit/b369f6a91218998b80f5558d3adab8a118a96388
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    R libraries/schema/Visio_Relation_Schema.class.php

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


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

  Changed paths:
    M ChangeLog
    M libraries/plugins/import/ImportOds.class.php

  Log Message:
  -----------
  bug #3645 Better handling of invalid ODS documents


  Commit: 31f7230fa7ac939068929e737947e69012554c5f
      https://github.com/phpmyadmin/phpmyadmin/commit/31f7230fa7ac939068929e737947e69012554c5f
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M po/si.po

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

Currently translated at 81.7% (2127 of 2603)


  Commit: 7d4a8fa3d21ea33595ae31fa5eb9ca809e37caf7
      https://github.com/phpmyadmin/phpmyadmin/commit/7d4a8fa3d21ea33595ae31fa5eb9ca809e37caf7
  Author: Peter Rosa <peter.rosa at pro.sk>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M po/sk.po

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

Currently translated at 78.3% (2038 of 2603)


  Commit: a0e86e92f13b8d88eaef12b368650ddc2b413ffa
      https://github.com/phpmyadmin/phpmyadmin/commit/a0e86e92f13b8d88eaef12b368650ddc2b413ffa
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/plugins/import/ImportOds.class.php

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


  Commit: f5d631dbf6e0e73b29cd60b17f24321e4922ebda
      https://github.com/phpmyadmin/phpmyadmin/commit/f5d631dbf6e0e73b29cd60b17f24321e4922ebda
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ChangeLog
    M sql.php

  Log Message:
  -----------
  bug #3976 Number of pages


  Commit: 385b04c86fc27fc2043e9f7af8bcb0faae9ff3d0
      https://github.com/phpmyadmin/phpmyadmin/commit/385b04c86fc27fc2043e9f7af8bcb0faae9ff3d0
  Author: Michal Čihař <michal at cihar.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M po/id.po

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

Currently translated at 74.8% (1947 of 2603)


  Commit: a0d0ab9ecb01b0b3b97220133bff2393370f9409
      https://github.com/phpmyadmin/phpmyadmin/commit/a0d0ab9ecb01b0b3b97220133bff2393370f9409
  Author: Peter Rosa <peter.rosa at pro.sk>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M po/sk.po

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

Currently translated at 83.7% (2180 of 2603)


  Commit: 99222656ee5fbf321683014cb79cdb6e2a4cd765
      https://github.com/phpmyadmin/phpmyadmin/commit/99222656ee5fbf321683014cb79cdb6e2a4cd765
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ChangeLog
    M sql.php

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


  Commit: 80dec52d987f7e9d8b59bbcc6e307cf48fd6a3e3
      https://github.com/phpmyadmin/phpmyadmin/commit/80dec52d987f7e9d8b59bbcc6e307cf48fd6a3e3
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/server_privileges.lib.php
    M server_privileges.php

  Log Message:
  -----------
  Fix bug#3922, user privileges, in QA_4_0


  Commit: 5778f641b32d126ac4c363c2962764e63d5eae23
      https://github.com/phpmyadmin/phpmyadmin/commit/5778f641b32d126ac4c363c2962764e63d5eae23
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

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

  Log Message:
  -----------
  4.0.4-rc1


  Commit: 64c2b9a59c09e4a04be2238553c3fcfbc58b7949
      https://github.com/phpmyadmin/phpmyadmin/commit/64c2b9a59c09e4a04be2238553c3fcfbc58b7949
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

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

  Log Message:
  -----------
  4.0.4 release


  Commit: cf73ac0c1d1583871390fc64812c100f103e3af1
      https://github.com/phpmyadmin/phpmyadmin/commit/cf73ac0c1d1583871390fc64812c100f103e3af1
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M doc/config.rst
    M doc/faq.rst
    M export.php
    M import_status.php
    M index.php
    M js/ajax.js
    M js/tbl_select.js
    M libraries/Config.class.php
    M libraries/Header.class.php
    M libraries/Menu.class.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/display_import_ajax.lib.php
    M libraries/error.inc.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportExcel.class.php
    M libraries/plugins/import/ImportOds.class.php
    M libraries/relation.lib.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    R libraries/schema/Visio_Relation_Schema.class.php
    M libraries/select_lang.lib.php
    M libraries/server_privileges.lib.php
    M libraries/structure.lib.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at 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/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.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/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/ko.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/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 at 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 at latin.po
    M po/zh_CN.po
    M po/zh_TW.po
    M server_privileges.php
    M sql.php
    M test/libraries/select_lang/PMA_langDetails_test.php

  Log Message:
  -----------
  Merge branch 'MAINT_4_0_4' into STABLE


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/085c6df3ff7a...cf73ac0c1d15


More information about the Git mailing list