[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e00b03: Add hint about updating Docker at release time

2017-02-06 Thread Isaac Bennetch
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e00b03a24eecb538dee48d99a5cff8d67a7ff1c0
  
https://github.com/phpmyadmin/phpmyadmin/commit/e00b03a24eecb538dee48d99a5cff8d67a7ff1c0
  Author: Isaac Bennetch 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M scripts/create-release.sh

  Log Message:
  ---
  Add hint about updating Docker at release time

Signed-off-by: Isaac Bennetch 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a927c5: Extend lost password FAQ

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a927c52322e098d04a35a32468d5c244c7556811
  
https://github.com/phpmyadmin/phpmyadmin/commit/a927c52322e098d04a35a32468d5c244c7556811
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/faq.rst

  Log Message:
  ---
  Extend lost password FAQ

Signed-off-by: Michal Čihař 


  Commit: a338d6e7f092b74fe7aa8451ed09d0d68be5b4c0
  
https://github.com/phpmyadmin/phpmyadmin/commit/a338d6e7f092b74fe7aa8451ed09d0d68be5b4c0
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/faq.rst

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/52db42edfcbd...a338d6e7f092___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a927c5: Extend lost password FAQ

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a927c52322e098d04a35a32468d5c244c7556811
  
https://github.com/phpmyadmin/phpmyadmin/commit/a927c52322e098d04a35a32468d5c244c7556811
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/faq.rst

  Log Message:
  ---
  Extend lost password FAQ

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f26d74: Add Docker sample for haproxy and subpath

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f26d74544b4eadaebc2b3363ceae2df8b4921264
  
https://github.com/phpmyadmin/phpmyadmin/commit/f26d74544b4eadaebc2b3363ceae2df8b4921264
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Add Docker sample for haproxy and subpath

Fixes https://github.com/phpmyadmin/docker/issues/101

Signed-off-by: Michal Čihař 


  Commit: 52db42edfcbd60a85739409ba7a248be80bc298f
  
https://github.com/phpmyadmin/phpmyadmin/commit/52db42edfcbd60a85739409ba7a248be80bc298f
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/9859461733a2...52db42edfcbd___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f26d74: Add Docker sample for haproxy and subpath

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f26d74544b4eadaebc2b3363ceae2df8b4921264
  
https://github.com/phpmyadmin/phpmyadmin/commit/f26d74544b4eadaebc2b3363ceae2df8b4921264
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Add Docker sample for haproxy and subpath

Fixes https://github.com/phpmyadmin/docker/issues/101

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/sql-parser] 25ef6e: Scrutinizer Auto-Fixes

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 25ef6e11c7460d20f607788ad5a08403c04c5543
  
https://github.com/phpmyadmin/sql-parser/commit/25ef6e11c7460d20f607788ad5a08403c04c5543
  Author: Scrutinizer Auto-Fixer 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M src/Components/CaseExpression.php
M src/Statements/SetStatement.php

  Log Message:
  ---
  Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on 
https://scrutinizer-ci.com


  Commit: bcac15ad1a42209df2a25b93c90d22cfdb949c6d
  
https://github.com/phpmyadmin/sql-parser/commit/bcac15ad1a42209df2a25b93c90d22cfdb949c6d
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M src/Components/CaseExpression.php
M src/Statements/SetStatement.php

  Log Message:
  ---
  Merge pull request #133 from nijel/scrutinizer-patch-1

Scrutinizer Auto-Fixes


Compare: 
https://github.com/phpmyadmin/sql-parser/compare/39a522e8a3bd...bcac15ad1a42___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0d9c11: Fixed export of tracking data

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0d9c1101acc5167274d2d3be6b4ec5abb3939f27
  
https://github.com/phpmyadmin/phpmyadmin/commit/0d9c1101acc5167274d2d3be6b4ec5abb3939f27
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

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

  Log Message:
  ---
  Fixed export of tracking data

Fixes #12954

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 0d9c11: Fixed export of tracking data

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0d9c1101acc5167274d2d3be6b4ec5abb3939f27
  
https://github.com/phpmyadmin/phpmyadmin/commit/0d9c1101acc5167274d2d3be6b4ec5abb3939f27
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

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

  Log Message:
  ---
  Fixed export of tracking data

Fixes #12954

Signed-off-by: Michal Čihař 


  Commit: 9859461733a282b8c7f091b03c2ef0e6b1251762
  
https://github.com/phpmyadmin/phpmyadmin/commit/9859461733a282b8c7f091b03c2ef0e6b1251762
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

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

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/ebfc86934b64...9859461733a2___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f73a98: Fixed database renaming

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f73a98e42176e1c463afd1d1c573892d3d1f7959
  
https://github.com/phpmyadmin/phpmyadmin/commit/f73a98e42176e1c463afd1d1c573892d3d1f7959
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M ChangeLog
M db_operations.php

  Log Message:
  ---
  Fixed database renaming

Fixes #12955

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f73a98: Fixed database renaming

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f73a98e42176e1c463afd1d1c573892d3d1f7959
  
https://github.com/phpmyadmin/phpmyadmin/commit/f73a98e42176e1c463afd1d1c573892d3d1f7959
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M ChangeLog
M db_operations.php

  Log Message:
  ---
  Fixed database renaming

Fixes #12955

Signed-off-by: Michal Čihař 


  Commit: ebfc86934b643c70fe7e755eef11d89da96513fa
  
https://github.com/phpmyadmin/phpmyadmin/commit/ebfc86934b643c70fe7e755eef11d89da96513fa
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M ChangeLog
M db_operations.php

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/3cfe34985d62...ebfc86934b64___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b575f7: db_central_columns: new column collapsing issue

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b575f7ef1b6477f5240da31053d30ef75eb5ab49
  
https://github.com/phpmyadmin/phpmyadmin/commit/b575f7ef1b6477f5240da31053d30ef75eb5ab49
  Author: Piyush Agrawal 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M db_central_columns.php
M libraries/central_columns.lib.php
M test/libraries/PMA_central_columns_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  db_central_columns: new column collapsing issue

Signed-off-by: Piyush Agrawal 


  Commit: 80de04451754e747ec5d9b15183a682f4e718991
  
https://github.com/phpmyadmin/phpmyadmin/commit/80de04451754e747ec5d9b15183a682f4e718991
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Changelog entry for #12904 and #12939

Signed-off-by: Michal Čihař 


  Commit: 3cfe34985d6291919989c5a7139c71bc67bb8b6c
  
https://github.com/phpmyadmin/phpmyadmin/commit/3cfe34985d6291919989c5a7139c71bc67bb8b6c
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M ChangeLog
M db_central_columns.php
M libraries/central_columns.lib.php
M test/libraries/PMA_central_columns_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/5d3a6fbc2546...3cfe34985d62___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b575f7: db_central_columns: new column collapsing issue

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b575f7ef1b6477f5240da31053d30ef75eb5ab49
  
https://github.com/phpmyadmin/phpmyadmin/commit/b575f7ef1b6477f5240da31053d30ef75eb5ab49
  Author: Piyush Agrawal 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M db_central_columns.php
M libraries/central_columns.lib.php
M test/libraries/PMA_central_columns_test.php
M themes/original/css/common.css.php
M themes/pmahomme/css/common.css.php

  Log Message:
  ---
  db_central_columns: new column collapsing issue

Signed-off-by: Piyush Agrawal 


  Commit: 80de04451754e747ec5d9b15183a682f4e718991
  
https://github.com/phpmyadmin/phpmyadmin/commit/80de04451754e747ec5d9b15183a682f4e718991
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Changelog entry for #12904 and #12939

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/9b534e55cab9...80de04451754___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1b7914: Remove connect_type setting

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1b7914a4e59e962849092f746b3bbee05c7d8f64
  
https://github.com/phpmyadmin/phpmyadmin/commit/1b7914a4e59e962849092f746b3bbee05c7d8f64
  Author: Michal Čihař 
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M libraries/DatabaseInterface.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/ConfigFile.php
M libraries/config/Validator.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/plugins/auth/AuthenticationCookie.php
M setup/lib/common.inc.php
M test/classes/config/ConfigFileTest.php
M test/classes/config/FormDisplayTest.php
M test/classes/config/FormTest.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/test_data/config.inc.php

  Log Message:
  ---
  Remove connect_type setting

It is really not necessary as MySQL decides connection type rather based
on hostname than on anything else.

Signed-off-by: Michal Čihař 


  Commit: 34946a285b27eedc3854a8be5a72915662e04fa8
  
https://github.com/phpmyadmin/phpmyadmin/commit/34946a285b27eedc3854a8be5a72915662e04fa8
  Author: Isaac Bennetch 
  Date:   2017-02-04 (Sat, 04 Feb 2017)

  Changed paths:
M doc/config.rst

  Log Message:
  ---
  Improve documentation on socket or tcp/ip setup

Signed-off-by: Michal Čihař 


  Commit: 7201940bcc5d58177ae5fe1c8791d3aca33325d2
  
https://github.com/phpmyadmin/phpmyadmin/commit/7201940bcc5d58177ae5fe1c8791d3aca33325d2
  Author: Capita-Finnish 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M po/fi.po

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

Currently translated at 69.4% ( of 3199 strings)

[CI skip]


  Commit: 33717e72689ab55d13ae8d3d6c092e6012a4349e
  
https://github.com/phpmyadmin/phpmyadmin/commit/33717e72689ab55d13ae8d3d6c092e6012a4349e
  Author: Franco 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M po/es.po

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

Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]


  Commit: 3d29350b0a6145e07632e6bcc95f1e44bd6d06e6
  
https://github.com/phpmyadmin/phpmyadmin/commit/3d29350b0a6145e07632e6bcc95f1e44bd6d06e6
  Author: Weblate 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/setup.rst

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


  Commit: 162d13566238d03c0a64295429f183cdbb323a8a
  
https://github.com/phpmyadmin/phpmyadmin/commit/162d13566238d03c0a64295429f183cdbb323a8a
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/config.rst

  Log Message:
  ---
  Clarify socket connection docs

Signed-off-by: Michal Čihař 


  Commit: 9b534e55cab963dcd46d6ea560ced19b29ea5398
  
https://github.com/phpmyadmin/phpmyadmin/commit/9b534e55cab963dcd46d6ea560ced19b29ea5398
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M libraries/DatabaseInterface.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/ConfigFile.php
M libraries/config/Validator.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/plugins/auth/AuthenticationCookie.php
M setup/lib/common.inc.php
M test/classes/config/ConfigFileTest.php
M test/classes/config/FormDisplayTest.php
M test/classes/config/FormTest.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/test_data/config.inc.php

  Log Message:
  ---
  Merge pull request #12950 from nijel/connect_type

Remove connect_type setting


  Commit: 569fcc1ef37033cfc12585ea24ac021e5f3f9264
  
https://github.com/phpmyadmin/phpmyadmin/commit/569fcc1ef37033cfc12585ea24ac021e5f3f9264
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Log Message:
  ---
  Merge commit '3d29350b0a6145e07632e6bcc95f1e44bd6d06e6'


  Commit: 5d3a6fbc2546b0820cdc45196dddf947e5f7a90c
  
https://github.com/phpmyadmin/phpmyadmin/commit/5d3a6fbc2546b0820cdc45196dddf947e5f7a90c
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M libraries/DatabaseInterface.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/ConfigFile.php
M libraries/config/Validator.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/plugins/auth/AuthenticationCookie.php
  

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1b7914: Remove connect_type setting

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1b7914a4e59e962849092f746b3bbee05c7d8f64
  
https://github.com/phpmyadmin/phpmyadmin/commit/1b7914a4e59e962849092f746b3bbee05c7d8f64
  Author: Michal Čihař 
  Date:   2017-02-02 (Thu, 02 Feb 2017)

  Changed paths:
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M libraries/DatabaseInterface.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/ConfigFile.php
M libraries/config/Validator.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/plugins/auth/AuthenticationCookie.php
M setup/lib/common.inc.php
M test/classes/config/ConfigFileTest.php
M test/classes/config/FormDisplayTest.php
M test/classes/config/FormTest.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/test_data/config.inc.php

  Log Message:
  ---
  Remove connect_type setting

It is really not necessary as MySQL decides connection type rather based
on hostname than on anything else.

Signed-off-by: Michal Čihař 


  Commit: 34946a285b27eedc3854a8be5a72915662e04fa8
  
https://github.com/phpmyadmin/phpmyadmin/commit/34946a285b27eedc3854a8be5a72915662e04fa8
  Author: Isaac Bennetch 
  Date:   2017-02-04 (Sat, 04 Feb 2017)

  Changed paths:
M doc/config.rst

  Log Message:
  ---
  Improve documentation on socket or tcp/ip setup

Signed-off-by: Michal Čihař 


  Commit: 162d13566238d03c0a64295429f183cdbb323a8a
  
https://github.com/phpmyadmin/phpmyadmin/commit/162d13566238d03c0a64295429f183cdbb323a8a
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/config.rst

  Log Message:
  ---
  Clarify socket connection docs

Signed-off-by: Michal Čihař 


  Commit: 9b534e55cab963dcd46d6ea560ced19b29ea5398
  
https://github.com/phpmyadmin/phpmyadmin/commit/9b534e55cab963dcd46d6ea560ced19b29ea5398
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M config.sample.inc.php
M doc/config.rst
M examples/config.manyhosts.inc.php
M libraries/DatabaseInterface.php
M libraries/common.inc.php
M libraries/config.default.php
M libraries/config.values.php
M libraries/config/ConfigFile.php
M libraries/config/Validator.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
M libraries/plugins/auth/AuthenticationCookie.php
M setup/lib/common.inc.php
M test/classes/config/ConfigFileTest.php
M test/classes/config/FormDisplayTest.php
M test/classes/config/FormTest.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/test_data/config.inc.php

  Log Message:
  ---
  Merge pull request #12950 from nijel/connect_type

Remove connect_type setting


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/3d29350b0a61...9b534e55cab9___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] 39a522: Document changes

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 39a522e8a3bd4caed8a17303611477b87fd202fe
  
https://github.com/phpmyadmin/sql-parser/commit/39a522e8a3bd4caed8a17303611477b87fd202fe
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M CHANGELOG.md

  Log Message:
  ---
  Document changes

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/sql-parser] 024294: Run php-cs-fixer

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 024294e3850135922086679153064e24723f3f54
  
https://github.com/phpmyadmin/sql-parser/commit/024294e3850135922086679153064e24723f3f54
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Run php-cs-fixer

Signed-off-by: Michal Čihař 


  Commit: c5feb2eea5bdfd67c44afa69bb50fbeb182a1c15
  
https://github.com/phpmyadmin/sql-parser/commit/c5feb2eea5bdfd67c44afa69bb50fbeb182a1c15
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M src/Core.php

  Log Message:
  ---
  Fix class name

Signed-off-by: Michal Čihař 


  Commit: bead40dc670e715ed4309d343ef3d33f519d7446
  
https://github.com/phpmyadmin/sql-parser/commit/bead40dc670e715ed4309d343ef3d33f519d7446
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M src/Lexer.php
M src/Utils/Query.php

  Log Message:
  ---
  Fix comment type

Signed-off-by: Michal Čihař 


  Commit: ba296bd6e2017b6c73add5f3c8ba56eac5a984c2
  
https://github.com/phpmyadmin/sql-parser/commit/ba296bd6e2017b6c73add5f3c8ba56eac5a984c2
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M src/Context.php
M src/Lexer.php
M src/Statements/DeleteStatement.php
M src/Statements/DropStatement.php
M src/Statements/SelectStatement.php
M src/Statements/UpdateStatement.php
M src/Utils/Formatter.php
M tools/ContextGenerator.php

  Log Message:
  ---
  Remove double spacing

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/sql-parser/compare/65fb611e091e...ba296bd6e201___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/docker]

2017-02-06 Thread nijel
  Branch: refs/tags/4.6.6-1
  Home:   https://github.com/phpmyadmin/docker
___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] 7f61c4: Begin writing new format queries tests

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 7f61c4b57fafce54d77bfded84314b57d5182080
  
https://github.com/phpmyadmin/sql-parser/commit/7f61c4b57fafce54d77bfded84314b57d5182080
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Begin writing new format queries tests


  Commit: e4f682702c43e5251e9868035e4f7d970d97d370
  
https://github.com/phpmyadmin/sql-parser/commit/e4f682702c43e5251e9868035e4f7d970d97d370
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  select with comment


  Commit: fd87828bba25cdfc24b977a19c6571276b3b7d5d
  
https://github.com/phpmyadmin/sql-parser/commit/fd87828bba25cdfc24b977a19c6571276b3b7d5d
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing comments


  Commit: 73348fcaeed8916ba2c097e9b3a4464680f11892
  
https://github.com/phpmyadmin/sql-parser/commit/73348fcaeed8916ba2c097e9b3a4464680f11892
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Rebased on top of master


  Commit: a067ee1e863e6bcb7f72251bb4371241e451bc6a
  
https://github.com/phpmyadmin/sql-parser/commit/a067ee1e863e6bcb7f72251bb4371241e451bc6a
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing strip comments


  Commit: 7368fddbb16559a6c706a0ece6c9e5b710440089
  
https://github.com/phpmyadmin/sql-parser/commit/7368fddbb16559a6c706a0ece6c9e5b710440089
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing keywords


  Commit: 8f857c00f27c25dd7a6807dfbf47dc231a1531ea
  
https://github.com/phpmyadmin/sql-parser/commit/8f857c00f27c25dd7a6807dfbf47dc231a1531ea
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing create procedure


  Commit: f810a7bf08ced39a5e731b8b824bc2ed642d96be
  
https://github.com/phpmyadmin/sql-parser/commit/f810a7bf08ced39a5e731b8b824bc2ed642d96be
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing Insert


  Commit: d92d5f996dd5ffa8f4300a684790ded68c375221
  
https://github.com/phpmyadmin/sql-parser/commit/d92d5f996dd5ffa8f4300a684790ded68c375221
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing distinct count


  Commit: ac5d4b119b4372673f5192f05a94109b7112edab
  
https://github.com/phpmyadmin/sql-parser/commit/ac5d4b119b4372673f5192f05a94109b7112edab
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing string as alias


  Commit: 9dde9b870b737b62d48250d8935e3c577b008556
  
https://github.com/phpmyadmin/sql-parser/commit/9dde9b870b737b62d48250d8935e3c577b008556
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing escaping cli and escaping html


  Commit: 6242ca938c314419448a5169b6f475a7edc193bb
  
https://github.com/phpmyadmin/sql-parser/commit/6242ca938c314419448a5169b6f475a7edc193bb
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M src/Utils/Formatter.php
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing create table


  Commit: efdf6f3dd915a0d349effdc1d2eaff3515379a66
  
https://github.com/phpmyadmin/sql-parser/commit/efdf6f3dd915a0d349effdc1d2eaff3515379a66
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing minimal and simply


  Commit: ce5781cfafd249f06d36b7a938bdef8f7a7c765f
  
https://github.com/phpmyadmin/sql-parser/commit/ce5781cfafd249f06d36b7a938bdef8f7a7c765f
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Fix test create table


  Commit: 74d4450635ee56dd9ac4b5524a1b26159605cb5d
  
https://github.com/phpmyadmin/sql-parser/commit/74d4450635ee56dd9ac4b5524a1b26159605cb5d
  Author: Damian Dlugosz 
  Date:   2017-02-01 (Wed, 01 Feb 2017)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Testing typical


  Commit: 9a120dfede5f

[phpMyAdmin Git] [phpmyadmin/sql-parser] 196607: Run generators without locales

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 196607e420ffd05348d41e31d5fa4c7e97adf45b
  
https://github.com/phpmyadmin/sql-parser/commit/196607e420ffd05348d41e31d5fa4c7e97adf45b
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M tools/run_generators.sh

  Log Message:
  ---
  Run generators without locales

We do not want localized messages to appear in testcases.

Signed-off-by: Michal Čihař 


  Commit: 5fdfa5b0767c8b62e5dd16f1b99465c2d59c9d2f
  
https://github.com/phpmyadmin/sql-parser/commit/5fdfa5b0767c8b62e5dd16f1b99465c2d59c9d2f
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M src/Token.php
M tests/data/bugs/gh14.out
M tests/data/bugs/gh16.out
M tests/data/bugs/gh9.out
M tests/data/bugs/pma11800.out
M tests/data/bugs/pma11836.out
M tests/data/bugs/pma11843.out
M tests/data/bugs/pma11867.out
M tests/data/bugs/pma11879.out
M tests/data/lexer/lex.out
M tests/data/lexer/lexBool.out
M tests/data/lexer/lexComment.out
M tests/data/lexer/lexDelimiter.out
M tests/data/lexer/lexDelimiter2.out
M tests/data/lexer/lexDelimiterErr1.out
M tests/data/lexer/lexDelimiterErr2.out
M tests/data/lexer/lexDelimiterErr3.out
M tests/data/lexer/lexKeyword.out
M tests/data/lexer/lexKeyword2.out
M tests/data/lexer/lexLabel1.out
M tests/data/lexer/lexLabel2.out
M tests/data/lexer/lexNumber.out
M tests/data/lexer/lexOperator.out
M tests/data/lexer/lexString.out
M tests/data/lexer/lexStringErr1.out
M tests/data/lexer/lexSymbol.out
M tests/data/lexer/lexSymbolErr1.out
M tests/data/lexer/lexSymbolErr2.out
M tests/data/lexer/lexSymbolErr3.out
M tests/data/lexer/lexSymbolUser.out
M tests/data/lexer/lexUtf8.out
M tests/data/lexer/lexWhitespace.out
M tests/data/parser/parse.out
M tests/data/parser/parse2.out
M tests/data/parser/parseAlter.out
M tests/data/parser/parseAlter2.out
M tests/data/parser/parseAlter3.out
M tests/data/parser/parseAlter4.out
M tests/data/parser/parseAlter5.out
M tests/data/parser/parseAlter6.out
M tests/data/parser/parseArrayErr1.out
M tests/data/parser/parseArrayErr3.out
M tests/data/parser/parseCall.out
M tests/data/parser/parseCall2.out
M tests/data/parser/parseCall3.out
M tests/data/parser/parseCreateFunction.out
M tests/data/parser/parseCreateFunctionErr1.out
M tests/data/parser/parseCreateFunctionErr2.out
M tests/data/parser/parseCreateProcedure.out
M tests/data/parser/parseCreateProcedure2.out
M tests/data/parser/parseCreateTable.out
M tests/data/parser/parseCreateTable2.out
M tests/data/parser/parseCreateTable3.out
M tests/data/parser/parseCreateTable4.out
M tests/data/parser/parseCreateTable5.out
M tests/data/parser/parseCreateTable6.out
M tests/data/parser/parseCreateTableAsSelect.out
M tests/data/parser/parseCreateTableErr1.out
M tests/data/parser/parseCreateTableErr2.out
M tests/data/parser/parseCreateTableErr3.out
M tests/data/parser/parseCreateTableErr4.out
M tests/data/parser/parseCreateTableErr5.out
M tests/data/parser/parseCreateTableLike.out
M tests/data/parser/parseCreateTableSelect.out
M tests/data/parser/parseCreateTableSpatial.out
M tests/data/parser/parseCreateTableTimestampWithPrecision.out
M tests/data/parser/parseCreateTrigger.out
M tests/data/parser/parseCreateUser.out
M tests/data/parser/parseCreateView.out
M tests/data/parser/parseCreateView2.out
M tests/data/parser/parseCreateViewWithQuotes.out
M tests/data/parser/parseCreateViewWithoutQuotes.out
M tests/data/parser/parseDelete.out
M tests/data/parser/parseDelete10.out
M tests/data/parser/parseDelete11.out
M tests/data/parser/parseDelete12.out
M tests/data/parser/parseDelete2.out
M tests/data/parser/parseDelete3.out
M tests/data/parser/parseDelete4.out
M tests/data/parser/parseDelete5.out
M tests/data/parser/parseDelete6.out
M tests/data/parser/parseDelete7.out
M tests/data/parser/parseDelete8.out
M tests/data/parser/parseDelete9.out
M tests/data/parser/parseDeleteErr1.out
M tests/data/parser/parseDeleteErr10.out
M tests/data/parser/parseDeleteErr11.out
M tests/data/parser/parseDeleteErr12.out
M tests/data/parser/parseDeleteErr2.out
M tests/data/parser/parseDeleteErr3.out
M tests/data/parser/parseDeleteErr4.out
M tests/data/parser/parseDeleteErr5.out
M tests/data/parser/parseDeleteErr6.out
M tests/data/parser/parseDeleteErr7.out
M tests/data/parser/parseDeleteErr8.out
M tests/data/parser/parseDeleteErr9.out
M tests/data/parser/parseDelimiter.out
M tests/data/parser/parseExplain.out
M tests/data/parser/parseInsert.out
M tests/data/parser/parseInsertErr.out
M tests/data/parser/parseInsertErr2.out
M tests/

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 720194: Translated using Weblate (Finnish)

2017-02-06 Thread Weblate
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7201940bcc5d58177ae5fe1c8791d3aca33325d2
  
https://github.com/phpmyadmin/phpmyadmin/commit/7201940bcc5d58177ae5fe1c8791d3aca33325d2
  Author: Capita-Finnish 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M po/fi.po

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

Currently translated at 69.4% ( of 3199 strings)

[CI skip]


  Commit: 33717e72689ab55d13ae8d3d6c092e6012a4349e
  
https://github.com/phpmyadmin/phpmyadmin/commit/33717e72689ab55d13ae8d3d6c092e6012a4349e
  Author: Franco 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M po/es.po

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

Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]


  Commit: 3d29350b0a6145e07632e6bcc95f1e44bd6d06e6
  
https://github.com/phpmyadmin/phpmyadmin/commit/3d29350b0a6145e07632e6bcc95f1e44bd6d06e6
  Author: Weblate 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/setup.rst

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/87ebf137c155...3d29350b0a61___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2559d3: Translated using Weblate (Spanish)

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2559d3e448cddd8da4d536b453b10cec7f0d3349
  
https://github.com/phpmyadmin/phpmyadmin/commit/2559d3e448cddd8da4d536b453b10cec7f0d3349
  Author: Franco 
  Date:   2017-02-04 (Sat, 04 Feb 2017)

  Changed paths:
M po/es.po

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

Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]


  Commit: 87ebf137c1554cae67a4fa1e161af8952fe56545
  
https://github.com/phpmyadmin/phpmyadmin/commit/87ebf137c1554cae67a4fa1e161af8952fe56545
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Add example for customizing configuration file using docker-compose

Fixes https://github.com/phpmyadmin/docker/issues/82

Signed-off-by: Michal Čihař 


  Commit: 7aae76983349eca9193a673c6f1fa9ae081b
  
https://github.com/phpmyadmin/phpmyadmin/commit/7aae76983349eca9193a673c6f1fa9ae081b
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Log Message:
  ---
  Merge commit '2559d3e448cddd8da4d536b453b10cec7f0d3349'


  Commit: 474cda3c90967dd9ca3351e67bbbaf49642280a1
  
https://github.com/phpmyadmin/phpmyadmin/commit/474cda3c90967dd9ca3351e67bbbaf49642280a1
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Merge branch 'QA_4_7'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/8a6d7dec2377...474cda3c9096___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a33776: Translated using Weblate (Finnish)

2017-02-06 Thread Weblate
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a3377670ed22805b8af5e072b7b729f62ff9395e
  
https://github.com/phpmyadmin/phpmyadmin/commit/a3377670ed22805b8af5e072b7b729f62ff9395e
  Author: Capita-Finnish 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M po/fi.po

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

Currently translated at 69.4% ( of 3199 strings)

[CI skip]


  Commit: b734097a5cf436bfb0c700d034dabbd20431cfb5
  
https://github.com/phpmyadmin/phpmyadmin/commit/b734097a5cf436bfb0c700d034dabbd20431cfb5
  Author: Franco 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M po/es.po

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

Currently translated at 100.0% (3199 of 3199 strings)

[CI skip]


  Commit: 754b9dc98e7e4ea60e9f7a4d21be0fe544bb3a7a
  
https://github.com/phpmyadmin/phpmyadmin/commit/754b9dc98e7e4ea60e9f7a4d21be0fe544bb3a7a
  Author: Weblate 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/setup.rst

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/474cda3c9096...754b9dc98e7e___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 87ebf1: Add example for customizing configuration file usi...

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/QA_4_7
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 87ebf137c1554cae67a4fa1e161af8952fe56545
  
https://github.com/phpmyadmin/phpmyadmin/commit/87ebf137c1554cae67a4fa1e161af8952fe56545
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M doc/setup.rst

  Log Message:
  ---
  Add example for customizing configuration file using docker-compose

Fixes https://github.com/phpmyadmin/docker/issues/82

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/docker] b4d05f: Update to 4.6

2017-02-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: b4d05f2604aa06faaf4377efa4bb2801220bc490
  
https://github.com/phpmyadmin/docker/commit/b4d05f2604aa06faaf4377efa4bb2801220bc490
  Author: Michal Čihař 
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  Update to 4.6

Fixes #105

Signed-off-by: Michal Čihař 


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