[phpMyAdmin Git] [phpmyadmin/localized_docs] eb240d: Translated using Weblate (Catalan)

2017-07-18 Thread Володимир Бриняк
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: eb240d3bf4eefc75efb48e5086898540d4802b73
  
https://github.com/phpmyadmin/localized_docs/commit/eb240d3bf4eefc75efb48e5086898540d4802b73
  Author: Xavier Navarro 
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
M po/ca.mo
M po/ca.po

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

Currently translated at 7.4% (182 of 2428 strings)

[CI skip]


  Commit: 418cb228318ae0424c5aa3e69e69c1363a52d637
  
https://github.com/phpmyadmin/localized_docs/commit/418cb228318ae0424c5aa3e69e69c1363a52d637
  Author: Володимир Бриняк 
  Date:   2017-07-19 (Wed, 19 Jul 2017)

  Changed paths:
M po/uk.mo
M po/uk.po

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

Currently translated at 79.2% (1923 of 2428 strings)

[CI skip]


Compare: 
https://github.com/phpmyadmin/localized_docs/compare/88c9e535e801...418cb228318a___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3de772: Translated using Weblate (Slovenian)

2017-07-18 Thread Domen
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3de772ea5aef66e6bfd6ead1e787fa83fa9463da
  
https://github.com/phpmyadmin/phpmyadmin/commit/3de772ea5aef66e6bfd6ead1e787fa83fa9463da
  Author: Domen 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M po/sl.po

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

Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 982e61: Translated using Weblate (Turkish)

2017-07-18 Thread Burak Yavuz
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 982e6180b1fd66d8d9f91ac7d921139390e9c900
  
https://github.com/phpmyadmin/phpmyadmin/commit/982e6180b1fd66d8d9f91ac7d921139390e9c900
  Author: Burak Yavuz 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M po/tr.po

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

Currently translated at 100.0% (3213 of 3213 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 300cc8: Factor out code for MIME tranformations mapping

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 300cc8b8b2810dd8b2ec8063c12eda3e41afe10b
  
https://github.com/phpmyadmin/phpmyadmin/commit/300cc8b8b2810dd8b2ec8063c12eda3e41afe10b
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M libraries/transformations.lib.php

  Log Message:
  ---
  Factor out code for MIME tranformations mapping

Issue #1347

Signed-off-by: Michal Čihař 


  Commit: b7788850a9f545dd693d476f51349096c83426cf
  
https://github.com/phpmyadmin/phpmyadmin/commit/b7788850a9f545dd693d476f51349096c83426cf
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/transformations.lib.php
M test/libraries/PMA_transformation_test.php

  Log Message:
  ---
  Fixed usage of some browser transformations

Fixes #13478

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/8dd03810438c...b7788850a9f5___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 7d90ec: Translated using Weblate (Interlingua)

2017-07-18 Thread Weblate via Git
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7d90ecfe4f1a4b7951a824857817d74fc71007a7
  
https://github.com/phpmyadmin/phpmyadmin/commit/7d90ecfe4f1a4b7951a824857817d74fc71007a7
  Author: Giovanni Sora 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M po/ia.po

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

Currently translated at 75.5% (2426 of 3213 strings)

[CI skip]


  Commit: 5db9a3eed236126982bb54bab86f8b48d85662e0
  
https://github.com/phpmyadmin/phpmyadmin/commit/5db9a3eed236126982bb54bab86f8b48d85662e0
  Author: Weblate 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/classes/Transformations.php
M test/classes/TransformationsTest.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/master'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/0da9acc65725...5db9a3eed236___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 300cc8: Factor out code for MIME tranformations mapping

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 300cc8b8b2810dd8b2ec8063c12eda3e41afe10b
  
https://github.com/phpmyadmin/phpmyadmin/commit/300cc8b8b2810dd8b2ec8063c12eda3e41afe10b
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M libraries/transformations.lib.php

  Log Message:
  ---
  Factor out code for MIME tranformations mapping

Issue #1347

Signed-off-by: Michal Čihař 


  Commit: b7788850a9f545dd693d476f51349096c83426cf
  
https://github.com/phpmyadmin/phpmyadmin/commit/b7788850a9f545dd693d476f51349096c83426cf
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/transformations.lib.php
M test/libraries/PMA_transformation_test.php

  Log Message:
  ---
  Fixed usage of some browser transformations

Fixes #13478

Signed-off-by: Michal Čihař 


  Commit: 0da9acc65725d146dba88bddb6a22d4e326470f3
  
https://github.com/phpmyadmin/phpmyadmin/commit/0da9acc65725d146dba88bddb6a22d4e326470f3
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/classes/Transformations.php
M test/classes/TransformationsTest.php

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/632eea08fa64...0da9acc65725___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 8dd038: Update po files

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8dd03810438c2154939734e92cba4dc2561175ce
  
https://github.com/phpmyadmin/phpmyadmin/commit/8dd03810438c2154939734e92cba4dc2561175ce
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/b...@latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/brx.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/fil.po
M po/fr.po
M po/fy.po
M po/gl.po
M po/gu.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/ig.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kab.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/s...@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/u...@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: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 8dd038: Update po files

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8dd03810438c2154939734e92cba4dc2561175ce
  
https://github.com/phpmyadmin/phpmyadmin/commit/8dd03810438c2154939734e92cba4dc2561175ce
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/b...@latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/brx.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/fil.po
M po/fr.po
M po/fy.po
M po/gl.po
M po/gu.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/ig.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kab.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/s...@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/u...@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: Michal Čihař 


  Commit: 5d9056367c5501b0d4a41e54348a059258d68310
  
https://github.com/phpmyadmin/phpmyadmin/commit/5d9056367c5501b0d4a41e54348a059258d68310
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M doc/faq.rst
M scripts/create-release.sh
M scripts/update-po

  Log Message:
  ---
  Fix path to Config.php in master

Signed-off-by: Michal Čihař 


  Commit: 3ff7cf52e7bc7caa3b18a3f0e09ccfb5ffaa26dc
  
https://github.com/phpmyadmin/phpmyadmin/commit/3ff7cf52e7bc7caa3b18a3f0e09ccfb5ffaa26dc
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/b...@latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/brx.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/fil.po
M po/fr.po
M po/fy.po
M po/gl.po
M po/gu.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/ig.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kab.po
M po/kk.po
M po/km.po
M po/kn.po
M po/ko.po
M po/ksh.po
M po/ku.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/s...@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/u...@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: Michal Čihař 


  Commit: 632eea08fa64762221c9e8171758f59df4e7fc4b
  
https://github.com/phpmyadmin/phpmyadmin/commit/632eea08fa64762221c9e8171758f59df4e7fc4b
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/7cc0ae9acb78...632eea08fa64___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 471b34: Allow SSL connection even when the certs are not s...

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 471b341d2e645595847d527ca872db92a49045c9
  
https://github.com/phpmyadmin/phpmyadmin/commit/471b341d2e645595847d527ca872db92a49045c9
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M libraries/dbi/DBIMysqli.php

  Log Message:
  ---
  Allow SSL connection even when the certs are not set

Issue #13436

Signed-off-by: Michal Čihař 


  Commit: b2a902de4d0b68ac6428d36ad9b5da1a8cc679e6
  
https://github.com/phpmyadmin/phpmyadmin/commit/b2a902de4d0b68ac6428d36ad9b5da1a8cc679e6
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/dbi/DBIMysqli.php

  Log Message:
  ---
  Switch to SSL connection if server tells us to do so

Fixes #13436

Signed-off-by: Michal Čihař 


  Commit: 7cc0ae9acb783d10b6b310101ec7e213a8c752a0
  
https://github.com/phpmyadmin/phpmyadmin/commit/7cc0ae9acb783d10b6b310101ec7e213a8c752a0
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/classes/Dbi/DbiMysqli.php

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/7244330aa052...7cc0ae9acb78___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 471b34: Allow SSL connection even when the certs are not s...

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 471b341d2e645595847d527ca872db92a49045c9
  
https://github.com/phpmyadmin/phpmyadmin/commit/471b341d2e645595847d527ca872db92a49045c9
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M libraries/dbi/DBIMysqli.php

  Log Message:
  ---
  Allow SSL connection even when the certs are not set

Issue #13436

Signed-off-by: Michal Čihař 


  Commit: b2a902de4d0b68ac6428d36ad9b5da1a8cc679e6
  
https://github.com/phpmyadmin/phpmyadmin/commit/b2a902de4d0b68ac6428d36ad9b5da1a8cc679e6
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/dbi/DBIMysqli.php

  Log Message:
  ---
  Switch to SSL connection if server tells us to do so

Fixes #13436

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/b2b3886e22f3...b2a902de4d0b___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 724433: Add missing server version definition

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7244330aa0524dd71c4c5abc3c5873e33dcdfb1c
  
https://github.com/phpmyadmin/phpmyadmin/commit/7244330aa0524dd71c4c5abc3c5873e33dcdfb1c
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M libraries/server_privileges.lib.php

  Log Message:
  ---
  Add missing server version definition

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b2b388: Fail if ini_set/ini_get are disabled

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b2b3886e22f3df54e78084cecb255bbe5ea509f3
  
https://github.com/phpmyadmin/phpmyadmin/commit/b2b3886e22f3df54e78084cecb255bbe5ea509f3
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/common.inc.php

  Log Message:
  ---
  Fail if ini_set/ini_get are disabled

We might support operation without these two later, but it's quite a lot
of work and nobody was really requesting this.

Fixes #13471

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b2b388: Fail if ini_set/ini_get are disabled

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b2b3886e22f3df54e78084cecb255bbe5ea509f3
  
https://github.com/phpmyadmin/phpmyadmin/commit/b2b3886e22f3df54e78084cecb255bbe5ea509f3
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/common.inc.php

  Log Message:
  ---
  Fail if ini_set/ini_get are disabled

We might support operation without these two later, but it's quite a lot
of work and nobody was really requesting this.

Fixes #13471

Signed-off-by: Michal Čihař 


  Commit: 85f5fd4bd6b6a349aa84c8a6eadeab9c2abe2c85
  
https://github.com/phpmyadmin/phpmyadmin/commit/85f5fd4bd6b6a349aa84c8a6eadeab9c2abe2c85
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M libraries/common.inc.php

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/d15da74edaf0...85f5fd4bd6b6___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 6e7c6a: Avoid breakage if set_time_limit is disabled

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6e7c6aed7d50714b151fff8b87cdcf0c50037aa7
  
https://github.com/phpmyadmin/phpmyadmin/commit/6e7c6aed7d50714b151fff8b87cdcf0c50037aa7
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M export.php
M import.php
M libraries/Util.php

  Log Message:
  ---
  Avoid breakage if set_time_limit is disabled

Fixs #13468

Signed-off-by: Michal Čihař 


  Commit: d15da74edaf0f9038d5356dab23866097ece0707
  
https://github.com/phpmyadmin/phpmyadmin/commit/d15da74edaf0f9038d5356dab23866097ece0707
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M export.php
M import.php
M libraries/classes/Util.php

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/9eb7287b72ec...d15da74edaf0___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 6e7c6a: Avoid breakage if set_time_limit is disabled

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6e7c6aed7d50714b151fff8b87cdcf0c50037aa7
  
https://github.com/phpmyadmin/phpmyadmin/commit/6e7c6aed7d50714b151fff8b87cdcf0c50037aa7
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M export.php
M import.php
M libraries/Util.php

  Log Message:
  ---
  Avoid breakage if set_time_limit is disabled

Fixs #13468

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4b4403: Update to current lint plugin

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4b4403aeef448e632b3f14d0fb74c4a748eae3c0
  
https://github.com/phpmyadmin/phpmyadmin/commit/4b4403aeef448e632b3f14d0fb74c4a748eae3c0
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M js/codemirror/addon/lint/lint.js

  Log Message:
  ---
  Update to current lint plugin

Our patch has been integrated.

Signed-off-by: Michal Čihař 


  Commit: 9eb7287b72ecd275f0d456eee1c1bd65a340205d
  
https://github.com/phpmyadmin/phpmyadmin/commit/9eb7287b72ecd275f0d456eee1c1bd65a340205d
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M js/vendor/codemirror/addon/lint/lint.js

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/0cd143f274e2...9eb7287b72ec___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 4b4403: Update to current lint plugin

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4b4403aeef448e632b3f14d0fb74c4a748eae3c0
  
https://github.com/phpmyadmin/phpmyadmin/commit/4b4403aeef448e632b3f14d0fb74c4a748eae3c0
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M js/codemirror/addon/lint/lint.js

  Log Message:
  ---
  Update to current lint plugin

Our patch has been integrated.

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0971a9: Change variable name to match upstream

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0971a91698a6ae2e5dd70447bd76f59964162669
  
https://github.com/phpmyadmin/phpmyadmin/commit/0971a91698a6ae2e5dd70447bd76f59964162669
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M js/codemirror/addon/lint/lint.js
M js/codemirror/addon/lint/sql-lint.js

  Log Message:
  ---
  Change variable name to match upstream

See https://github.com/codemirror/CodeMirror/pull/4861

Signed-off-by: Michal Čihař 


  Commit: 0cd143f274e2d1d43a95e6db1dd7b00f96079163
  
https://github.com/phpmyadmin/phpmyadmin/commit/0cd143f274e2d1d43a95e6db1dd7b00f96079163
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M js/codemirror/addon/lint/sql-lint.js
M js/vendor/codemirror/addon/lint/lint.js

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/cc954750bbb3...0cd143f274e2___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1a90f9: Bring back CSS customization for CodeMirror

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1a90f9723184170113e0fbc5e96a23ef897a7451
  
https://github.com/phpmyadmin/phpmyadmin/commit/1a90f9723184170113e0fbc5e96a23ef897a7451
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M themes/pmahomme/css/codemirror.css.php

  Log Message:
  ---
  Bring back CSS customization for CodeMirror

Originally it was done by patching upstream sources in 4c24db0, but that
was lost when upgrading.

Issue #13489

Signed-off-by: Michal Čihař 


  Commit: 639c2b8c4bad8b36508b6a059632a1c6dce85637
  
https://github.com/phpmyadmin/phpmyadmin/commit/639c2b8c4bad8b36508b6a059632a1c6dce85637
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M js/codemirror/addon/lint/lint.js
M js/codemirror/addon/lint/sql-lint.js
M libraries/Linter.php

  Log Message:
  ---
  Fixed rendering SQL lint errors

- add patch to CodeMirror to render HTML, it's submitted upstream as
  https://github.com/codemirror/CodeMirror/pull/4861
- properly escape html output of Linter, now when we use full HTML

Fixes #13489

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/c73f451cde7a...639c2b8c4bad___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1a90f9: Bring back CSS customization for CodeMirror

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1a90f9723184170113e0fbc5e96a23ef897a7451
  
https://github.com/phpmyadmin/phpmyadmin/commit/1a90f9723184170113e0fbc5e96a23ef897a7451
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M themes/pmahomme/css/codemirror.css.php

  Log Message:
  ---
  Bring back CSS customization for CodeMirror

Originally it was done by patching upstream sources in 4c24db0, but that
was lost when upgrading.

Issue #13489

Signed-off-by: Michal Čihař 


  Commit: 639c2b8c4bad8b36508b6a059632a1c6dce85637
  
https://github.com/phpmyadmin/phpmyadmin/commit/639c2b8c4bad8b36508b6a059632a1c6dce85637
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M js/codemirror/addon/lint/lint.js
M js/codemirror/addon/lint/sql-lint.js
M libraries/Linter.php

  Log Message:
  ---
  Fixed rendering SQL lint errors

- add patch to CodeMirror to render HTML, it's submitted upstream as
  https://github.com/codemirror/CodeMirror/pull/4861
- properly escape html output of Linter, now when we use full HTML

Fixes #13489

Signed-off-by: Michal Čihař 


  Commit: cc954750bbb36032c3c80882ad1d9b9c3db5b9f9
  
https://github.com/phpmyadmin/phpmyadmin/commit/cc954750bbb36032c3c80882ad1d9b9c3db5b9f9
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M ChangeLog
M js/codemirror/addon/lint/sql-lint.js
M js/vendor/codemirror/addon/lint/lint.js
M libraries/classes/Linter.php
M themes/pmahomme/css/codemirror.css.php

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/d463309502a2...cc954750bbb3___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c73f45: Always cleanup composer file

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c73f451cde7ad9e37596bfeb9cf7180063af8186
  
https://github.com/phpmyadmin/phpmyadmin/commit/c73f451cde7ad9e37596bfeb9cf7180063af8186
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M scripts/create-release.sh

  Log Message:
  ---
  Always cleanup composer file

Signed-off-by: Michal Čihař 


  Commit: d463309502a23ac59fb9c26f07b49c6fa24f78f1
  
https://github.com/phpmyadmin/phpmyadmin/commit/d463309502a23ac59fb9c26f07b49c6fa24f78f1
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M scripts/create-release.sh

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/22b27fa3e307...d463309502a2___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c73f45: Always cleanup composer file

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c73f451cde7ad9e37596bfeb9cf7180063af8186
  
https://github.com/phpmyadmin/phpmyadmin/commit/c73f451cde7ad9e37596bfeb9cf7180063af8186
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M scripts/create-release.sh

  Log Message:
  ---
  Always cleanup composer file

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c592ba: Translated using Weblate (Bulgarian)

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c592ba6a0e28cbf4489a0bcd83b74ad22ca4b234
  
https://github.com/phpmyadmin/phpmyadmin/commit/c592ba6a0e28cbf4489a0bcd83b74ad22ca4b234
  Author: NMilchev 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M po/bg.po

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

Currently translated at 60.4% (1937 of 3203 strings)

[CI skip]


  Commit: 22b27fa3e307ac4d2ee9d94148e691fd6c80082e
  
https://github.com/phpmyadmin/phpmyadmin/commit/22b27fa3e307ac4d2ee9d94148e691fd6c80082e
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/41e8a3db4301...22b27fa3e307___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c592ba: Translated using Weblate (Bulgarian)

2017-07-18 Thread NMilchev
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c592ba6a0e28cbf4489a0bcd83b74ad22ca4b234
  
https://github.com/phpmyadmin/phpmyadmin/commit/c592ba6a0e28cbf4489a0bcd83b74ad22ca4b234
  Author: NMilchev 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M po/bg.po

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

Currently translated at 60.4% (1937 of 3203 strings)

[CI skip]


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 51fb18: Move Theme object out of session

2017-07-18 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 51fb18612aec88a62f95006fd1906b55b17b91d2
  
https://github.com/phpmyadmin/phpmyadmin/commit/51fb18612aec88a62f95006fd1906b55b17b91d2
  Author: Michal Čihař 
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
M js/get_image.js.php
M js/messages.php
M libraries/classes/Config.php
M libraries/classes/Header.php
M libraries/classes/ThemeManager.php
M libraries/classes/Util.php
M templates/database/designer/database_tables.phtml
M templates/database/designer/side_menu.phtml
M templates/database/designer/table_list.phtml
M test/bootstrap-dist.php
M test/classes/ConfigTest.php
M test/classes/HeaderTest.php
M test/classes/MenuTest.php
M test/classes/ThemeTest.php
M test/classes/config/FormDisplayTest.php
M test/classes/config/FormTest.php
M test/classes/navigation/NodeDatabaseChildTest.php
M test/libraries/PMA_relation_test.php
M test/libraries/common/PMA_checkParameters_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php

  Log Message:
  ---
  Move Theme object out of session

Honestly I don't see good reason for storing Theme in session as loading
it from the session will take about same time as loading it from the
disk.

Additionally it seems that current code really didn't really use the
object stored in session, it was constructed with every request anyway
(by ThemeManager::initializeTheme).

Signed-off-by: Michal Čihař 


  Commit: 942e44afe70f5fb5984b577b994a2959f17734fa
  
https://github.com/phpmyadmin/phpmyadmin/commit/942e44afe70f5fb5984b577b994a2959f17734fa
  Author: Michal Čihař 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M js/get_image.js.php
M js/messages.php
M libraries/classes/Config.php
M libraries/classes/Header.php
M libraries/classes/ThemeManager.php
M libraries/classes/Util.php
M templates/database/designer/database_tables.phtml
M templates/database/designer/side_menu.phtml
M templates/database/designer/table_list.phtml
M test/bootstrap-dist.php
M test/classes/ConfigTest.php
M test/classes/HeaderTest.php
M test/classes/MenuTest.php
M test/classes/ThemeTest.php
M test/classes/config/FormDisplayTest.php
M test/classes/config/FormTest.php
M test/classes/navigation/NodeDatabaseChildTest.php
M test/libraries/PMA_relation_test.php
M test/libraries/common/PMA_checkParameters_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php

  Log Message:
  ---
  Merge pull request #13499 from nijel/theme

Move Theme object out of session


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/964f3d896356...942e44afe70f___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] dc4a1a: Translated using Weblate (Bulgarian)

2017-07-18 Thread Weblate via Git
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: dc4a1a2213e68c656fbb2ae0cdcbf78e0f0a3452
  
https://github.com/phpmyadmin/phpmyadmin/commit/dc4a1a2213e68c656fbb2ae0cdcbf78e0f0a3452
  Author: NMilchev 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M po/bg.po

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

Currently translated at 60.1% (1930 of 3211 strings)

[CI skip]


  Commit: 41e8a3db430123b8e540856a29f9987e77ff25d9
  
https://github.com/phpmyadmin/phpmyadmin/commit/41e8a3db430123b8e540856a29f9987e77ff25d9
  Author: Weblate 
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
M js/get_image.js.php
M js/messages.php
M libraries/classes/Config.php
M libraries/classes/Header.php
M libraries/classes/ThemeManager.php
M libraries/classes/Util.php
M templates/database/designer/database_tables.phtml
M templates/database/designer/side_menu.phtml
M templates/database/designer/table_list.phtml
M test/bootstrap-dist.php
M test/classes/ConfigTest.php
M test/classes/HeaderTest.php
M test/classes/MenuTest.php
M test/classes/ThemeTest.php
M test/classes/config/FormDisplayTest.php
M test/classes/config/FormTest.php
M test/classes/navigation/NodeDatabaseChildTest.php
M test/libraries/PMA_relation_test.php
M test/libraries/common/PMA_checkParameters_test.php
M test/libraries/rte/PMA_RTN_getEditorForm_test.php

  Log Message:
  ---
  Merge remote-tracking branch 'origin/master'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/942e44afe70f...41e8a3db4301___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git