[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cea9aa: Revert c9c280e9921d and b39933c37b8c

Mon Mar 9 15:37:58 CET 2015

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cea9aa968871715ad5e57bb43d4babda95fda2a6
      https://github.com/phpmyadmin/phpmyadmin/commit/cea9aa968871715ad5e57bb43d4babda95fda2a6
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Revert c9c280e9921d and b39933c37b8c

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>


  Commit: d52d0a6032888b75d3cf97343c08267487c6dafd
      https://github.com/phpmyadmin/phpmyadmin/commit/d52d0a6032888b75d3cf97343c08267487c6dafd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  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/eo.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/fy.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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/li.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/ne.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/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

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

[CI skip]

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


  Commit: c103a830181a6cc4fd8ccacb8d9831208b5845b8
      https://github.com/phpmyadmin/phpmyadmin/commit/c103a830181a6cc4fd8ccacb8d9831208b5845b8
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]


  Commit: a4a0fd66888665f8416f6b5063f5cbb33d4fb71f
      https://github.com/phpmyadmin/phpmyadmin/commit/a4a0fd66888665f8416f6b5063f5cbb33d4fb71f
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]


  Commit: 8ea3fbcd51054a9027b7035c957b06a3580d1f51
      https://github.com/phpmyadmin/phpmyadmin/commit/8ea3fbcd51054a9027b7035c957b06a3580d1f51
  Author: Παναγιώτης Παπάζογλου <papaz_p at yahoo.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M po/el.po

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

Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]


  Commit: 15105efab10997094353dbb00f5830dea0a54c6f
      https://github.com/phpmyadmin/phpmyadmin/commit/15105efab10997094353dbb00f5830dea0a54c6f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M po/fr.po

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

Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]


  Commit: 730fd4764f5b014be09e3ca15b21d111219caad4
      https://github.com/phpmyadmin/phpmyadmin/commit/730fd4764f5b014be09e3ca15b21d111219caad4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M po/fr.po

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

Currently translated at 99.9% (3031 of 3032 strings)

[CI skip]


  Commit: b30ab8dba1923f2bd62c76aa639b928dc9d9d8d0
      https://github.com/phpmyadmin/phpmyadmin/commit/b30ab8dba1923f2bd62c76aa639b928dc9d9d8d0
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M po/cs.po

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

Currently translated at 92.7% (2812 of 3032 strings)

[CI skip]


  Commit: 30da4c59ae65bf5d0ebb35c90cb5bd9a245ed593
      https://github.com/phpmyadmin/phpmyadmin/commit/30da4c59ae65bf5d0ebb35c90cb5bd9a245ed593
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M po/ia.po

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

Currently translated at 68.6% (2082 of 3032 strings)

[CI skip]


  Commit: 29613841dbdfc10b7234f84b283abcc26d93e95b
      https://github.com/phpmyadmin/phpmyadmin/commit/29613841dbdfc10b7234f84b283abcc26d93e95b
  Author: Domen <mitenem at outlook.com>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M po/sl.po

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

Currently translated at 99.9% (3031 of 3032 strings)

[CI skip]


  Commit: 16a90d653de75b1485128b73589e7548d56b0bde
      https://github.com/phpmyadmin/phpmyadmin/commit/16a90d653de75b1485128b73589e7548d56b0bde
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M po/fr.po

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

Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]


  Commit: a08353de46a431b1d5fcec34b1bf9b551a4766fa
      https://github.com/phpmyadmin/phpmyadmin/commit/a08353de46a431b1d5fcec34b1bf9b551a4766fa
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M libraries/server_privileges.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/eo.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/fy.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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/li.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/ne.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/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

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

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


  Commit: 42bbc5e04d507bd8e864d04c69f68499755b32ef
      https://github.com/phpmyadmin/phpmyadmin/commit/42bbc5e04d507bd8e864d04c69f68499755b32ef
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationHttp.class.php

  Log Message:
  -----------
  bug #4758 Firefox with auth_type to http with multiple server doesn't work anymore

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


  Commit: 921710ec4de5ea73cb68c2f1dd6ae6ad64f5b350
      https://github.com/phpmyadmin/phpmyadmin/commit/921710ec4de5ea73cb68c2f1dd6ae6ad64f5b350
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M js/makegrid.js

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


  Commit: df39cff9ef9eff98b03185204d55920b9882a0dc
      https://github.com/phpmyadmin/phpmyadmin/commit/df39cff9ef9eff98b03185204d55920b9882a0dc
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

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

  Log Message:
  -----------
  Return value from the new method

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


  Commit: 1f630a1a97b7fc3a15ff344bd5e9cb60826f5577
      https://github.com/phpmyadmin/phpmyadmin/commit/1f630a1a97b7fc3a15ff344bd5e9cb60826f5577
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

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

  Log Message:
  -----------
  Update tests

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


  Commit: 7dde05cc4188db5477eec0e872db047110856b1b
      https://github.com/phpmyadmin/phpmyadmin/commit/7dde05cc4188db5477eec0e872db047110856b1b
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

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

  Log Message:
  -----------
  phpUnit is unable to mock private methods

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


  Commit: 9bf5792dc0fab3132789f93393fe30ab73ebee91
      https://github.com/phpmyadmin/phpmyadmin/commit/9bf5792dc0fab3132789f93393fe30ab73ebee91
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M ChangeLog
    M js/makegrid.js
    M libraries/plugins/auth/AuthenticationHttp.class.php
    M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php

  Log Message:
  -----------
  Merge branch 'QA_4_3' into QA_4_4


  Commit: da9359b9909921d136dc9b584631cb02e31acb1c
      https://github.com/phpmyadmin/phpmyadmin/commit/da9359b9909921d136dc9b584631cb02e31acb1c
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/ar.po

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

Currently translated at 37.3% (1133 of 3032 strings)

[CI skip]


  Commit: dc761ce5ef8f458f68b5584dd9c366e530f628a3
      https://github.com/phpmyadmin/phpmyadmin/commit/dc761ce5ef8f458f68b5584dd9c366e530f628a3
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/en_GB.po

  Log Message:
  -----------
  Translated using Weblate (English (United Kingdom))

Currently translated at 88.5% (2685 of 3032 strings)

[CI skip]


  Commit: dc52dd9c67c7e967ae3fbb35104eedb0d9a9dbe2
      https://github.com/phpmyadmin/phpmyadmin/commit/dc52dd9c67c7e967ae3fbb35104eedb0d9a9dbe2
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/ia.po

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

Currently translated at 68.7% (2085 of 3032 strings)

[CI skip]


  Commit: 0ae243251b282af0f029a44b3847b8d99d1e445b
      https://github.com/phpmyadmin/phpmyadmin/commit/0ae243251b282af0f029a44b3847b8d99d1e445b
  Author: Helder Santana <helder.bs.santana at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/pt_BR.po

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

Currently translated at 97.9% (2970 of 3032 strings)

[CI skip]


  Commit: a5e8dad8cd6290d3e050be11ed193d43986e066e
      https://github.com/phpmyadmin/phpmyadmin/commit/a5e8dad8cd6290d3e050be11ed193d43986e066e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/es.po

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

Currently translated at 99.1% (3006 of 3032 strings)

[CI skip]


  Commit: f5580dc46a093361662ea3307f24f8a3030b4384
      https://github.com/phpmyadmin/phpmyadmin/commit/f5580dc46a093361662ea3307f24f8a3030b4384
  Author: Weblate <noreply at weblate.org>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M ChangeLog
    M js/makegrid.js
    M libraries/plugins/auth/AuthenticationHttp.class.php
    M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php

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


  Commit: 3821b724cc5d105b06bbdb5f34705d2407dd2d8a
      https://github.com/phpmyadmin/phpmyadmin/commit/3821b724cc5d105b06bbdb5f34705d2407dd2d8a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M db_central_columns.php
    M libraries/central_columns.lib.php

  Log Message:
  -----------
  Move col_extra handling code to a single method. Add such missing col_extra handling.

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


  Commit: 0c83b29313c8c2d999cee14ca30249cecda2e06a
      https://github.com/phpmyadmin/phpmyadmin/commit/0c83b29313c8c2d999cee14ca30249cecda2e06a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/ar.po
    M po/en_GB.po
    M po/es.po
    M po/ia.po
    M po/pt_BR.po

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


  Commit: eae98c0809e40fcfb877132a3ed83a77f192128b
      https://github.com/phpmyadmin/phpmyadmin/commit/eae98c0809e40fcfb877132a3ed83a77f192128b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/vi.po

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

Currently translated at 2.2% (68 of 3032 strings)

[CI skip]


  Commit: d572df784bcc1ac1ca8c66238344220b434042dd
      https://github.com/phpmyadmin/phpmyadmin/commit/d572df784bcc1ac1ca8c66238344220b434042dd
  Author: Weblate <noreply at weblate.org>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M db_central_columns.php
    M libraries/central_columns.lib.php

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


  Commit: 19116baec018ced7c25c9267d0ead774f3d12b8d
      https://github.com/phpmyadmin/phpmyadmin/commit/19116baec018ced7c25c9267d0ead774f3d12b8d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M libraries/central_columns.lib.php

  Log Message:
  -----------
  Check whether there are columns.

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


  Commit: 2b3c393f95d3408c4ce6e59ca808473d588b2c34
      https://github.com/phpmyadmin/phpmyadmin/commit/2b3c393f95d3408c4ce6e59ca808473d588b2c34
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/vi.po

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


  Commit: ccbfaeef7f1d948a5929dbff7717056513567696
      https://github.com/phpmyadmin/phpmyadmin/commit/ccbfaeef7f1d948a5929dbff7717056513567696
  Author: Helder Santana <helder.bs.santana at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/pt_BR.po

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

Currently translated at 98.0% (2972 of 3032 strings)

[CI skip]


  Commit: cd69422729b98f82be3cc7a07655df7b520354f6
      https://github.com/phpmyadmin/phpmyadmin/commit/cd69422729b98f82be3cc7a07655df7b520354f6
  Author: Weblate <noreply at weblate.org>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M libraries/central_columns.lib.php

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


  Commit: d912798fd006020fd3ea57b28854e6397fa262fb
      https://github.com/phpmyadmin/phpmyadmin/commit/d912798fd006020fd3ea57b28854e6397fa262fb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  These are not generic expectations

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


  Commit: 547606bd263c56446dce67649c2e7a80d380188c
      https://github.com/phpmyadmin/phpmyadmin/commit/547606bd263c56446dce67649c2e7a80d380188c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M libraries/central_columns.lib.php
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Fix testPMAGetColumnsList()

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


  Commit: a90b8bc8e23736ed15f8ebe4cbf57fc829934f64
      https://github.com/phpmyadmin/phpmyadmin/commit/a90b8bc8e23736ed15f8ebe4cbf57fc829934f64
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Move test data to instance variable with reuse in mind

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


  Commit: 19a1f376f5f9a6040bfbed923ebdab2952769e4b
      https://github.com/phpmyadmin/phpmyadmin/commit/19a1f376f5f9a6040bfbed923ebdab2952769e4b
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M libraries/central_columns.lib.php
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Fix testPMAGetCentralColumnsCount()

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


  Commit: 5e8d08186983aafb46d809fb7c0b99abde965678
      https://github.com/phpmyadmin/phpmyadmin/commit/5e8d08186983aafb46d809fb7c0b99abde965678
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Fix testPMADeleteColumnsFromList()

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


  Commit: b6724c5cf6b2fee1945c58d2c833f78c416e5a7a
      https://github.com/phpmyadmin/phpmyadmin/commit/b6724c5cf6b2fee1945c58d2c833f78c416e5a7a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Cleanup duplicate code

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


  Commit: fd16be985968b880d6834f40ebe73b946e8176b9
      https://github.com/phpmyadmin/phpmyadmin/commit/fd16be985968b880d6834f40ebe73b946e8176b9
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Fix testPMAGetCentralColumnsFromTable()

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


  Commit: 4c2365e48c582200f4f6e734d5b9dbbbfc829fc3
      https://github.com/phpmyadmin/phpmyadmin/commit/4c2365e48c582200f4f6e734d5b9dbbbfc829fc3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Fix testPMAGetCentralColumnsListRaw()

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


  Commit: 7ece631025aa79ec122c60d04eabc0d573b0bc65
      https://github.com/phpmyadmin/phpmyadmin/commit/7ece631025aa79ec122c60d04eabc0d573b0bc65
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Fix testPMAFindExistingColNames()

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


  Commit: d6a36ef770ab47b544fead84863fbc797f5e0f27
      https://github.com/phpmyadmin/phpmyadmin/commit/d6a36ef770ab47b544fead84863fbc797f5e0f27
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Fix testPMAGetHTMLforColumnDropdown()

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


  Commit: 6952bd36c26552162e50d0297132f2b985a0fab6
      https://github.com/phpmyadmin/phpmyadmin/commit/6952bd36c26552162e50d0297132f2b985a0fab6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Fix testPMASyncUniqueColumns()

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


  Commit: e343567352552c3c88d645abb936e06fd209581b
      https://github.com/phpmyadmin/phpmyadmin/commit/e343567352552c3c88d645abb936e06fd209581b
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M po/pt_BR.po

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


  Commit: 635b830892c56bdceeac7d69d60c283000254132
      https://github.com/phpmyadmin/phpmyadmin/commit/635b830892c56bdceeac7d69d60c283000254132
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M ChangeLog
    M db_central_columns.php
    M js/makegrid.js
    M libraries/central_columns.lib.php
    M libraries/plugins/auth/AuthenticationHttp.class.php
    M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Merge branch 'QA_4_4'

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e9cabfa70503...635b830892c5