[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0f23dd: Add localStorage availability checks, update the e...

[Atul Pratap Singh]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0f23dd51d834e55d9629e39850af3a7673b48b11
      https://github.com/phpmyadmin/phpmyadmin/commit/0f23dd51d834e55d9629e39850af3a7673b48b11
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M ChangeLog
    M js/config.js
    M js/messages.php
    M js/server_status_monitor.js

  Log Message:
  -----------
  Add localStorage availability checks, update the error message

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


  Commit: 5613c32029135370d7bbc01f9ebc87d7204014c4
      https://github.com/phpmyadmin/phpmyadmin/commit/5613c32029135370d7bbc01f9ebc87d7204014c4
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]


  Commit: 814ea29854fb395468c5caa08d07a36000f750d0
      https://github.com/phpmyadmin/phpmyadmin/commit/814ea29854fb395468c5caa08d07a36000f750d0
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M po/fr.po

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

Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]


  Commit: 5b577198bb6be4956e56cf0eceac226d9173e672
      https://github.com/phpmyadmin/phpmyadmin/commit/5b577198bb6be4956e56cf0eceac226d9173e672
  Author: Xosé Calvo <xosecalvo at gmail.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M po/gl.po

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

Currently translated at 85.0% (2730 of 3210 strings)

[CI skip]


  Commit: 6b781d7fd706b15d05a6747c220573539165bd01
      https://github.com/phpmyadmin/phpmyadmin/commit/6b781d7fd706b15d05a6747c220573539165bd01
  Author: Weblate <noreply at weblate.org>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M ChangeLog
    M js/config.js
    M js/messages.php
    M js/server_status_monitor.js

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


  Commit: f03d49e6749819b28ea53b27cc03b3cf528a8c12
      https://github.com/phpmyadmin/phpmyadmin/commit/f03d49e6749819b28ea53b27cc03b3cf528a8c12
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

  Changed paths:
    M ChangeLog
    M js/config.js
    M js/messages.php
    M js/server_status_monitor.js

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

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

Conflicts:
	js/messages.php


  Commit: ea9a8aeadd8945f4b8fa8c359c0cd05f5da61d4e
      https://github.com/phpmyadmin/phpmyadmin/commit/ea9a8aeadd8945f4b8fa8c359c0cd05f5da61d4e
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2016-01-12 (Tue, 12 Jan 2016)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c32e2ed3a509...ea9a8aeadd89