[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 67b354: Fix error message in sql-parser.

2015-10-21 Thread Marc Delisle
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 67b3543bdac52533b49f05a6382e332b5fa3cc8c
  
https://github.com/phpmyadmin/phpmyadmin/commit/67b3543bdac52533b49f05a6382e332b5fa3cc8c
  Author: Dan Ungureanu 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M libraries/sql-parser/src/Components/OptionsArray.php

  Log Message:
  ---
  Fix error message in sql-parser.
Updated sql-parser to 
udan11/sql-parser@3d73f3877a7c471aa2754b3553bcfa3c73d31aa2 (v3.0.4).

Signed-off-by: Dan Ungureanu 


  Commit: 16729d1b907639263f5d9bb5e9c5353201bf714a
  
https://github.com/phpmyadmin/phpmyadmin/commit/16729d1b907639263f5d9bb5e9c5353201bf714a
  Author: Marc Delisle 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M libraries/sql-parser/src/Components/OptionsArray.php

  Log Message:
  ---
  Merge pull request #11593 from udan11/QA_4_5

Fix error message in sql-parser.


  Commit: b9101cbd7406b0951f7f5efbaac2558e57b14c1b
  
https://github.com/phpmyadmin/phpmyadmin/commit/b9101cbd7406b0951f7f5efbaac2558e57b14c1b
  Author: Marc Delisle 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry

Signed-off-by: Marc Delisle 


  Commit: 52de5b182ec83ae59ea971d1fd0888b842533c26
  
https://github.com/phpmyadmin/phpmyadmin/commit/52de5b182ec83ae59ea971d1fd0888b842533c26
  Author: Marc Delisle 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M ChangeLog
M libraries/sql-parser/src/Components/OptionsArray.php

  Log Message:
  ---
  Merge branch 'QA_4_5'


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] b9101c: ChangeLog entry

2015-10-21 Thread Marc Delisle
  Branch: refs/heads/QA_4_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b9101cbd7406b0951f7f5efbaac2558e57b14c1b
  
https://github.com/phpmyadmin/phpmyadmin/commit/b9101cbd7406b0951f7f5efbaac2558e57b14c1b
  Author: Marc Delisle 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry

Signed-off-by: Marc Delisle 


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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 67b354: Fix error message in sql-parser.

2015-10-21 Thread Marc Delisle
  Branch: refs/heads/QA_4_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 67b3543bdac52533b49f05a6382e332b5fa3cc8c
  
https://github.com/phpmyadmin/phpmyadmin/commit/67b3543bdac52533b49f05a6382e332b5fa3cc8c
  Author: Dan Ungureanu 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M libraries/sql-parser/src/Components/OptionsArray.php

  Log Message:
  ---
  Fix error message in sql-parser.
Updated sql-parser to 
udan11/sql-parser@3d73f3877a7c471aa2754b3553bcfa3c73d31aa2 (v3.0.4).

Signed-off-by: Dan Ungureanu 


  Commit: 16729d1b907639263f5d9bb5e9c5353201bf714a
  
https://github.com/phpmyadmin/phpmyadmin/commit/16729d1b907639263f5d9bb5e9c5353201bf714a
  Author: Marc Delisle 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M libraries/sql-parser/src/Components/OptionsArray.php

  Log Message:
  ---
  Merge pull request #11593 from udan11/QA_4_5

Fix error message in sql-parser.


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/fe7a2c095b9b...16729d1b9076___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] fe7a2c: Fixes #11592 Missing headers in zipped export

2015-10-21 Thread Marc Delisle
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: fe7a2c095b9bc6e36185076f314d361b48055edd
  
https://github.com/phpmyadmin/phpmyadmin/commit/fe7a2c095b9bc6e36185076f314d361b48055edd
  Author: Marc Delisle 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M ChangeLog
M export.php

  Log Message:
  ---
  Fixes #11592 Missing headers in zipped export

Signed-off-by: Marc Delisle 


  Commit: f869dbccc627b92ecb5d7746488c1e6bfad3c197
  
https://github.com/phpmyadmin/phpmyadmin/commit/f869dbccc627b92ecb5d7746488c1e6bfad3c197
  Author: Marc Delisle 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M ChangeLog
M export.php

  Log Message:
  ---
  Merge branch 'QA_4_5'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/7bea48283cbe...f869dbccc627___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] fe7a2c: Fixes #11592 Missing headers in zipped export

2015-10-21 Thread Marc Delisle
  Branch: refs/heads/QA_4_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: fe7a2c095b9bc6e36185076f314d361b48055edd
  
https://github.com/phpmyadmin/phpmyadmin/commit/fe7a2c095b9bc6e36185076f314d361b48055edd
  Author: Marc Delisle 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M ChangeLog
M export.php

  Log Message:
  ---
  Fixes #11592 Missing headers in zipped export

Signed-off-by: Marc Delisle 


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


[phpMyAdmin Git] [phpmyadmin/scripts] 19ff7f: Add 4.5.1 branch to demo server

2015-10-21 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/scripts
  Commit: 19ff7f42b332f07ce5d9d58b8a769a895628ca0e
  
https://github.com/phpmyadmin/scripts/commit/19ff7f42b332f07ce5d9d58b8a769a895628ca0e
  Author: Michal Čihař 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

  Changed paths:
M demo/php/versions.ini

  Log Message:
  ---
  Add 4.5.1 branch to demo server

Signed-off-by: Michal Čihař 


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


[phpMyAdmin Git] [phpmyadmin/localized_docs] 3c6dd5: Translated using Weblate (Armenian)

2015-10-21 Thread Andrey Aleksanyants
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 3c6dd5728f16a92639cb6cc6a8078a5bd16bb7c2
  
https://github.com/phpmyadmin/localized_docs/commit/3c6dd5728f16a92639cb6cc6a8078a5bd16bb7c2
  Author: Andrey Aleksanyants 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

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

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

Currently translated at 4.1% (78 of 1899 strings)

[CI skip]


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


[phpMyAdmin Git] [phpmyadmin/localized_docs] 3df50b: Translated using Weblate (French)

2015-10-21 Thread Marc Delisle
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 3df50b0c46eadf079dc034e8c90ce6be3bdbb765
  
https://github.com/phpmyadmin/localized_docs/commit/3df50b0c46eadf079dc034e8c90ce6be3bdbb765
  Author: Marc Delisle 
  Date:   2015-10-21 (Wed, 21 Oct 2015)

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

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

Currently translated at 90.8% (1726 of 1899 strings)

[CI skip]


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