[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 74ae9a: 4.6.0-alpha release

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 74ae9ab6d13beba625aac672911cd3b8f71b9810
      https://github.com/phpmyadmin/phpmyadmin/commit/74ae9ab6d13beba625aac672911cd3b8f71b9810
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

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

  Log Message:
  -----------
  4.6.0-alpha release

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: a1316ede8fde5c522bd4e1dc339b63e3317f41f8
      https://github.com/phpmyadmin/phpmyadmin/commit/a1316ede8fde5c522bd4e1dc339b63e3317f41f8
  Author: Rodrigo Moreira <digaumsmile at gmail.com>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

  Changed paths:
    M po/pt_BR.po

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

Currently translated at 91.5% (2944 of 3214 strings)

[CI skip]


  Commit: 57c66d1a5e55b4d4c6f26fd47a2a4affc0361da4
      https://github.com/phpmyadmin/phpmyadmin/commit/57c66d1a5e55b4d4c6f26fd47a2a4affc0361da4
  Author: Weblate <noreply at weblate.org>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

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

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


  Commit: d96dc09e99c8d05002cf955402e7733eb37ef378
      https://github.com/phpmyadmin/phpmyadmin/commit/d96dc09e99c8d05002cf955402e7733eb37ef378
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

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

  Log Message:
  -----------
  Correction for 4.6.0-alpha1 release

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


  Commit: c90d5a7485198930e079f464941dfe0235918971
      https://github.com/phpmyadmin/phpmyadmin/commit/c90d5a7485198930e079f464941dfe0235918971
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6


  Commit: c06ebed2f8f8b86822d5ca1de145615e6ff51cb4
      https://github.com/phpmyadmin/phpmyadmin/commit/c06ebed2f8f8b86822d5ca1de145615e6ff51cb4
  Author: Rodrigo Moreira <digaumsmile at gmail.com>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

  Changed paths:
    M po/pt_BR.po

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

Currently translated at 92.0% (2957 of 3214 strings)

[CI skip]


  Commit: a6ecc52b3d1245a30d270d871992f2fedcf84be6
      https://github.com/phpmyadmin/phpmyadmin/commit/a6ecc52b3d1245a30d270d871992f2fedcf84be6
  Author: Weblate <noreply at weblate.org>
  Date:   2016-02-10 (Wed, 10 Feb 2016)

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

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


  Commit: 33718de82f2dda55a747c2aa3c7cd9e7bda2dfa9
      https://github.com/phpmyadmin/phpmyadmin/commit/33718de82f2dda55a747c2aa3c7cd9e7bda2dfa9
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/controllers/table/TableStructureController.php
    M templates/table/structure/display_structure.phtml

  Log Message:
  -----------
  Fix #11923 Errors on Structure tab when user only has select access on certain columns

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


  Commit: 81b30ac6c6ab6eca2aa91d42edf20267b1600359
      https://github.com/phpmyadmin/phpmyadmin/commit/81b30ac6c6ab6eca2aa91d42edf20267b1600359
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/controllers/table/TableStructureController.php
    M templates/table/structure/display_structure.phtml

  Log Message:
  -----------
  Merge branch 'QA_4_6'

Conflicts:
	README
	doc/conf.py
	libraries/Config.php
	po/pt_BR.po


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b09826ffa363...81b30ac6c6ab