[phpMyAdmin Git] [phpmyadmin/localized_docs] a07098: Translated using Weblate (German)

2016-09-20 Thread Axel Rindle
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: a07098a7fe9c4f18c43c7ebf330d0b187f12733f
  
https://github.com/phpmyadmin/localized_docs/commit/a07098a7fe9c4f18c43c7ebf330d0b187f12733f
  Author: Axel Rindle 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

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

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

Currently translated at 25.7% (585 of 2272 strings)

[CI skip]


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


[phpMyAdmin Git] [phpmyadmin/localized_docs] a1bc03: Translated using Weblate (German)

2016-09-20 Thread Niemand Jedermann
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: a1bc03035e5add1b854bcd19fa696246992db133
  
https://github.com/phpmyadmin/localized_docs/commit/a1bc03035e5add1b854bcd19fa696246992db133
  Author: Niemand Jedermann 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

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

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

Currently translated at 25.7% (585 of 2272 strings)

[CI skip]


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


[phpMyAdmin Git] [phpmyadmin/localized_docs] 35ea52: Translated using Weblate (German)

2016-09-20 Thread Benedikt Volkmer
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 35ea52cc9f2f361c29af0bb9eb840647286d8ff3
  
https://github.com/phpmyadmin/localized_docs/commit/35ea52cc9f2f361c29af0bb9eb840647286d8ff3
  Author: Benedikt Volkmer 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

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

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

Currently translated at 25.7% (585 of 2272 strings)

[CI skip]


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


[phpMyAdmin Git] [phpmyadmin/localized_docs] 2ce22d: Translated using Weblate (German)

2016-09-20 Thread Niemand Jedermann
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 2ce22dc858ef7119a21f6c19f61be910f7079dbb
  
https://github.com/phpmyadmin/localized_docs/commit/2ce22dc858ef7119a21f6c19f61be910f7079dbb
  Author: Niemand Jedermann 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

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

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

Currently translated at 25.7% (584 of 2272 strings)

[CI skip]


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 5a456e: Fix extra spaces in field name in adding key and d...

2016-09-20 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5a456eb1eaa6d36d7317677c5bc0b228864d3102
  
https://github.com/phpmyadmin/phpmyadmin/commit/5a456eb1eaa6d36d7317677c5bc0b228864d3102
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M js/tbl_structure.js

  Log Message:
  ---
  Fix extra spaces in field name in adding key and dropping field

Fix #12575

Signed-off-by: Deven Bansod 


  Commit: 54063a75c3518de9c708e2c20e88494672ec4db8
  
https://github.com/phpmyadmin/phpmyadmin/commit/54063a75c3518de9c708e2c20e88494672ec4db8
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12575

Signed-off-by: Deven Bansod 


  Commit: 05cd3150740c4377d0edf6424b89297f8c57763e
  
https://github.com/phpmyadmin/phpmyadmin/commit/05cd3150740c4377d0edf6424b89297f8c57763e
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M ChangeLog
M js/tbl_structure.js

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/bcebfc81eda7...05cd3150740c___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 5a456e: Fix extra spaces in field name in adding key and d...

2016-09-20 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5a456eb1eaa6d36d7317677c5bc0b228864d3102
  
https://github.com/phpmyadmin/phpmyadmin/commit/5a456eb1eaa6d36d7317677c5bc0b228864d3102
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M js/tbl_structure.js

  Log Message:
  ---
  Fix extra spaces in field name in adding key and dropping field

Fix #12575

Signed-off-by: Deven Bansod 


  Commit: 54063a75c3518de9c708e2c20e88494672ec4db8
  
https://github.com/phpmyadmin/phpmyadmin/commit/54063a75c3518de9c708e2c20e88494672ec4db8
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12575

Signed-off-by: Deven Bansod 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/b463665b1384...54063a75c351___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 38cb18: Fix #12242 : Edit routine detail dialog does not f...

2016-09-20 Thread Deven Bansod
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 38cb18b0deefa00c5e2257c02c61ad882da0ba04
  
https://github.com/phpmyadmin/phpmyadmin/commit/38cb18b0deefa00c5e2257c02c61ad882da0ba04
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M libraries/rte/rte_routines.lib.php

  Log Message:
  ---
  Fix #12242 : Edit routine detail dialog does not fill "Return length" field 
in mysql functions

Use correct field to get the details about the length of returning value's 
datatype

Signed-off-by: Deven Bansod 


  Commit: b463665b1384db2d6222765ae9f3e520dc33d9d7
  
https://github.com/phpmyadmin/phpmyadmin/commit/b463665b1384db2d6222765ae9f3e520dc33d9d7
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12242

Signed-off-by: Deven Bansod 


  Commit: bcebfc81eda76351d983624acde7938b533dc80b
  
https://github.com/phpmyadmin/phpmyadmin/commit/bcebfc81eda76351d983624acde7938b533dc80b
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M ChangeLog
M libraries/rte/rte_routines.lib.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 38cb18: Fix #12242 : Edit routine detail dialog does not f...

2016-09-20 Thread Deven Bansod
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 38cb18b0deefa00c5e2257c02c61ad882da0ba04
  
https://github.com/phpmyadmin/phpmyadmin/commit/38cb18b0deefa00c5e2257c02c61ad882da0ba04
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M libraries/rte/rte_routines.lib.php

  Log Message:
  ---
  Fix #12242 : Edit routine detail dialog does not fill "Return length" field 
in mysql functions

Use correct field to get the details about the length of returning value's 
datatype

Signed-off-by: Deven Bansod 


  Commit: b463665b1384db2d6222765ae9f3e520dc33d9d7
  
https://github.com/phpmyadmin/phpmyadmin/commit/b463665b1384db2d6222765ae9f3e520dc33d9d7
  Author: Deven Bansod 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry for #12242

Signed-off-by: Deven Bansod 


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


[phpMyAdmin Git] [phpmyadmin/docker] 0ba8cd: Add missing find -exec separator

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: 0ba8cd2bc8f75350a3554e4b2d4c2ecc2d47ca81
  
https://github.com/phpmyadmin/docker/commit/0ba8cd2bc8f75350a3554e4b2d4c2ecc2d47ca81
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  Add missing find -exec separator

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/docker] f7319f: Fix line breaks

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: f7319feabf563804fb9edfaef36d2c01ed5f66a3
  
https://github.com/phpmyadmin/docker/commit/f7319feabf563804fb9edfaef36d2c01ed5f66a3
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  Fix line breaks

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/docker] ab8caa: Adjust permissions of /www

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: ab8caa4dd7a59e4a148922b66832f1861cb6c78d
  
https://github.com/phpmyadmin/docker/commit/ab8caa4dd7a59e4a148922b66832f1861cb6c78d
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  Adjust permissions of /www

Issue #52

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/docker] 8496f8: Start PHP-FPM as nobody

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: 8496f8fd255386620cfb3c704723cd9d71c1cc96
  
https://github.com/phpmyadmin/docker/commit/8496f8fd255386620cfb3c704723cd9d71c1cc96
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M etc/supervisor.d/php.ini

  Log Message:
  ---
  Start PHP-FPM as nobody

Issue #52

Signed-off-by: Michal Čihař 


  Commit: dc566553681079499d5504febb469a823afe85e1
  
https://github.com/phpmyadmin/docker/commit/dc566553681079499d5504febb469a823afe85e1
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M etc/nginx.conf
M etc/php-fpm.conf
M run.sh

  Log Message:
  ---
  Move PHP socket

Signed-off-by: Michal Čihař 


  Commit: df1677c26eab100d34a3ff7138e2397193074599
  
https://github.com/phpmyadmin/docker/commit/df1677c26eab100d34a3ff7138e2397193074599
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M test-docker.sh

  Log Message:
  ---
  Display supervisor log on error

Signed-off-by: Michal Čihař 


  Commit: 8c13128da94e03fd7cf6ec03d3ec7f6c1fd4b78e
  
https://github.com/phpmyadmin/docker/commit/8c13128da94e03fd7cf6ec03d3ec7f6c1fd4b78e
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M run.sh

  Log Message:
  ---
  Correctly prepare log for FPM

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/docker/compare/e2a6eb627e73...8c13128da94e___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/docker] e2a6eb: List processes at the end of test

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: e2a6eb627e735871da8ed2f1d49df5db73537744
  
https://github.com/phpmyadmin/docker/commit/e2a6eb627e735871da8ed2f1d49df5db73537744
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M test-docker.sh

  Log Message:
  ---
  List processes at the end of test

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d519c9: Update SQL parser to 3.4.7

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d519c9039e786b731925181eb74e606173fcec78
  
https://github.com/phpmyadmin/phpmyadmin/commit/d519c9039e786b731925181eb74e606173fcec78
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M ChangeLog
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M libraries/sql-parser/src/Statements/InsertStatement.php
M libraries/sql-parser/src/Utils/Formatter.php

  Log Message:
  ---
  Update SQL parser to 3.4.7

- issue #12298 Fixed export of view definitions

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d519c9: Update SQL parser to 3.4.7

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d519c9039e786b731925181eb74e606173fcec78
  
https://github.com/phpmyadmin/phpmyadmin/commit/d519c9039e786b731925181eb74e606173fcec78
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M ChangeLog
M libraries/sql-parser/src/Components/OptionsArray.php
M libraries/sql-parser/src/Statements/CreateStatement.php
M libraries/sql-parser/src/Statements/InsertStatement.php
M libraries/sql-parser/src/Utils/Formatter.php

  Log Message:
  ---
  Update SQL parser to 3.4.7

- issue #12298 Fixed export of view definitions

Signed-off-by: Michal Čihař 


  Commit: fa17f2459e44260158ca11498b077f0d1ac4dee1
  
https://github.com/phpmyadmin/phpmyadmin/commit/fa17f2459e44260158ca11498b077f0d1ac4dee1
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Merge branch 'QA_4_6'


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


[phpMyAdmin Git] [phpmyadmin/sql-parser] 21445c: Prepare for next version

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: 21445c40bdb4c9a166f000ed71d3a433de4699df
  
https://github.com/phpmyadmin/sql-parser/commit/21445c40bdb4c9a166f000ed71d3a433de4699df
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M CHANGELOG.md

  Log Message:
  ---
  Prepare for next version

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/sql-parser]

2016-09-20 Thread nijel
  Branch: refs/tags/v3.4.7
  Home:   https://github.com/phpmyadmin/sql-parser
___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/sql-parser] b29b87: Release

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: b29b872a92e9b29708b426a47aae5365184a606a
  
https://github.com/phpmyadmin/sql-parser/commit/b29b872a92e9b29708b426a47aae5365184a606a
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M CHANGELOG.md

  Log Message:
  ---
  Release

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/sql-parser] a483d1: Fixed escaping HTML entities in HTML formatter

2016-09-20 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/sql-parser
  Commit: a483d102eba78bed67ebcf713c3885c4302f3e73
  
https://github.com/phpmyadmin/sql-parser/commit/a483d102eba78bed67ebcf713c3885c4302f3e73
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M CHANGELOG.md
M src/Utils/Formatter.php

  Log Message:
  ---
  Fixed escaping HTML entities in HTML formatter

Fixes #83

Signed-off-by: Michal Čihař 


  Commit: c543b67d4e5fb9cafabe1b0ef304c824d0f24a25
  
https://github.com/phpmyadmin/sql-parser/commit/c543b67d4e5fb9cafabe1b0ef304c824d0f24a25
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M CHANGELOG.md
M src/Utils/Formatter.php

  Log Message:
  ---
  Fixed escaping of control chars in CLI formatter

Fixes #84

Signed-off-by: Michal Čihař 


  Commit: e188156ff4285b3cf2b2c46dd16740289ebe46ff
  
https://github.com/phpmyadmin/sql-parser/commit/e188156ff4285b3cf2b2c46dd16740289ebe46ff
  Author: Michal Čihař 
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
M tests/Utils/FormatterTest.php

  Log Message:
  ---
  Add tests for #83 and #84

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/sql-parser/compare/00eb34849e9e...e188156ff428___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git