[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 1b4360: Fixed possible invalid SQL export

2016-03-19 Thread Michal Čihař 
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1b43606a48bb6260aa9223fbb82547784ce6a3e8
  
https://github.com/phpmyadmin/phpmyadmin/commit/1b43606a48bb6260aa9223fbb82547784ce6a3e8
  Author: Michal Čihař 
  Date:   2016-03-18 (Fri, 18 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/plugins/export/ExportSql.php
M test/classes/plugin/export/ExportSqlTest.php

  Log Message:
  ---
  Fixed possible invalid SQL export

We should emit the charset restoration only if we have emitted its
setting in the header. As the condition was slightly different in both
cases it was possible that only one part of these two was emitted in
past.

Fixes #12074

Signed-off-by: Michal Čihař 


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

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 409ebf: Translated using Weblate (Slovak)

2016-03-19 Thread Weblate 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 409ebff98caae54e46bd393c8e726f0bfab79274
  
https://github.com/phpmyadmin/phpmyadmin/commit/409ebff98caae54e46bd393c8e726f0bfab79274
  Author: Jozef Pistej 
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
M po/sk.po

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

Currently translated at 82.8% (2664 of 3214 strings)

[CI skip]


  Commit: eb4f7534ddf3a1b79fb82a37ce6a7ab50dbffb30
  
https://github.com/phpmyadmin/phpmyadmin/commit/eb4f7534ddf3a1b79fb82a37ce6a7ab50dbffb30
  Author: Weblate 
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/plugins/auth/AuthenticationHttp.php

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


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

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] aa034b: Update SQL parser

2016-03-19 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: aa034bb0c9f3757b919cfc89056380b84e66e1ef
  
https://github.com/phpmyadmin/phpmyadmin/commit/aa034bb0c9f3757b919cfc89056380b84e66e1ef
  Author: Michal Čihař 
  Date:   2016-03-18 (Fri, 18 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/sql-parser/src/Components/Condition.php
A libraries/sql-parser/src/Utils/CLI.php
M libraries/sql-parser/src/Utils/Formatter.php

  Log Message:
  ---
  Update SQL parser

- issue #12026 Fixed parsing of UNION SELECT with brackets

Signed-off-by: Michal Čihař 


  Commit: aa1278b12dade6695e305f58843f9bca030d334f
  
https://github.com/phpmyadmin/phpmyadmin/commit/aa1278b12dade6695e305f58843f9bca030d334f
  Author: Michal Čihař 
  Date:   2016-03-18 (Fri, 18 Mar 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Merge branch 'QA_4_6'

Signed-off-by: Michal Čihař 


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

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 231165: Translated using Weblate (Azerbaijani)

2016-03-19 Thread Weblate 
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 23116557f2f93dbb94c7914fbc6bd0bb98302ade
  
https://github.com/phpmyadmin/phpmyadmin/commit/23116557f2f93dbb94c7914fbc6bd0bb98302ade
  Author: Sevdimali İsa 
  Date:   2016-03-19 (Sat, 19 Mar 2016)

  Changed paths:
M po/az.po

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

Currently translated at 52.4% (1685 of 3211 strings)

[CI skip]


  Commit: 61dd5a7b9408f6613dcd815b60a093004a84d388
  
https://github.com/phpmyadmin/phpmyadmin/commit/61dd5a7b9408f6613dcd815b60a093004a84d388
  Author: Weblate 
  Date:   2016-03-19 (Sat, 19 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/sql-parser/src/Statements/CreateStatement.php

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/cb1d20eb9275...61dd5a7b9408___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] cb1d20: Udate SQL parser to 9d8ae92

2016-03-19 Thread Michal Čihař 
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cb1d20eb9275691ec57be4e914e8bc9ddc3e63f3
  
https://github.com/phpmyadmin/phpmyadmin/commit/cb1d20eb9275691ec57be4e914e8bc9ddc3e63f3
  Author: Michal Čihař 
  Date:   2016-03-19 (Sat, 19 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/sql-parser/src/Statements/CreateStatement.php

  Log Message:
  ---
  Udate SQL parser to 9d8ae92

- issue #12109 Fixed parsing of CREATE TABLE [AS] SELECT

Signed-off-by: Michal Čihař 


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

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f33c8f: Translated using Weblate (Azerbaijani)

2016-03-19 Thread Weblate 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f33c8f63b9a521af65ba8a4dffabc139090e73e3
  
https://github.com/phpmyadmin/phpmyadmin/commit/f33c8f63b9a521af65ba8a4dffabc139090e73e3
  Author: Sevdimali İsa 
  Date:   2016-03-19 (Sat, 19 Mar 2016)

  Changed paths:
M po/az.po

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

Currently translated at 52.4% (1681 of 3208 strings)

[CI skip]


  Commit: ec6462b7bd01c8fe9eca6e24048139602f5d95ef
  
https://github.com/phpmyadmin/phpmyadmin/commit/ec6462b7bd01c8fe9eca6e24048139602f5d95ef
  Author: Weblate 
  Date:   2016-03-19 (Sat, 19 Mar 2016)

  Changed paths:
M ChangeLog

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


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

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] cb1d20: Udate SQL parser to 9d8ae92

2016-03-19 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cb1d20eb9275691ec57be4e914e8bc9ddc3e63f3
  
https://github.com/phpmyadmin/phpmyadmin/commit/cb1d20eb9275691ec57be4e914e8bc9ddc3e63f3
  Author: Michal Čihař 
  Date:   2016-03-19 (Sat, 19 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/sql-parser/src/Statements/CreateStatement.php

  Log Message:
  ---
  Udate SQL parser to 9d8ae92

- issue #12109 Fixed parsing of CREATE TABLE [AS] SELECT

Signed-off-by: Michal Čihař 


  Commit: f1ef05ef7712dcb6d27cba71010f24d406db88b6
  
https://github.com/phpmyadmin/phpmyadmin/commit/f1ef05ef7712dcb6d27cba71010f24d406db88b6
  Author: Michal Čihař 
  Date:   2016-03-19 (Sat, 19 Mar 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Merge branch 'QA_4_6'


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

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 6eb4ba: Fix typo

2016-03-19 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6eb4baed940c2ee827c5351d20a1a82730f919c0
  
https://github.com/phpmyadmin/phpmyadmin/commit/6eb4baed940c2ee827c5351d20a1a82730f919c0
  Author: Madhura Jayaratne 
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Fix typo

Signed-off-by: Madhura Jayaratne 


  Commit: 1523985bce4aeb15950e80aa75183a473c06430f
  
https://github.com/phpmyadmin/phpmyadmin/commit/1523985bce4aeb15950e80aa75183a473c06430f
  Author: Michal Čihař 
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/plugins/auth/AuthenticationHttp.php

  Log Message:
  ---
  Fix login after logout with http authentication

We can not check token here as it's always there (in the URL) after
logout.

Fixes #12098

Signed-off-by: Michal Čihař 


  Commit: f8ead4738e49b0215b325d4bec3568503216f809
  
https://github.com/phpmyadmin/phpmyadmin/commit/f8ead4738e49b0215b325d4bec3568503216f809
  Author: Michal Čihař 
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/plugins/auth/AuthenticationHttp.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/251cd5d071b1...f8ead4738e49___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/website] b71ac0: Remove expired sponsor

2016-03-19 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: b71ac05013f16b156da455bd3fe05615ce70d16d
  
https://github.com/phpmyadmin/website/commit/b71ac05013f16b156da455bd3fe05615ce70d16d
  Author: Michal Čihař 
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
M pmaweb/templates/sponsors.html

  Log Message:
  ---
  Remove expired sponsor

Signed-off-by: Michal Čihař 


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

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 902b41: Fix #12092 PHP Fatal error: Call to undefined func...

2016-03-19 Thread Madhura Jayaratne 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 902b41e86cbbccab50abe75cfde0b0751eedb593
  
https://github.com/phpmyadmin/phpmyadmin/commit/902b41e86cbbccab50abe75cfde0b0751eedb593
  Author: Madhura Jayaratne 
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/controllers/database/DatabaseStructureController.php

  Log Message:
  ---
  Fix #12092 PHP Fatal error: Call to undefined function __()

Signed-off-by: Madhura Jayaratne 


  Commit: 251cd5d071b194720a931cc2aa5591553fe3872b
  
https://github.com/phpmyadmin/phpmyadmin/commit/251cd5d071b194720a931cc2aa5591553fe3872b
  Author: Madhura Jayaratne 
  Date:   2016-03-16 (Wed, 16 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/controllers/database/DatabaseStructureController.php

  Log Message:
  ---
  Merge branch 'QA_4_6'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/46dee5d1eb6d...251cd5d071b1___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 670311: Translated using Weblate (Slovak)

2016-03-19 Thread Weblate 
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 670311dd24b70780ea56a46b9b693063635b0b75
  
https://github.com/phpmyadmin/phpmyadmin/commit/670311dd24b70780ea56a46b9b693063635b0b75
  Author: Jozef Pistej 
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
M po/sk.po

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

Currently translated at 83.1% (2671 of 3211 strings)

[CI skip]


  Commit: cdf07a17fe5491286484b3b1ca5d833796308c36
  
https://github.com/phpmyadmin/phpmyadmin/commit/cdf07a17fe5491286484b3b1ca5d833796308c36
  Author: Weblate 
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/plugins/auth/AuthenticationHttp.php

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/1523985bce4a...cdf07a17fe54___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] aa034b: Update SQL parser

2016-03-19 Thread Michal Čihař 
  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: aa034bb0c9f3757b919cfc89056380b84e66e1ef
  
https://github.com/phpmyadmin/phpmyadmin/commit/aa034bb0c9f3757b919cfc89056380b84e66e1ef
  Author: Michal Čihař 
  Date:   2016-03-18 (Fri, 18 Mar 2016)

  Changed paths:
M ChangeLog
M libraries/sql-parser/src/Components/Condition.php
A libraries/sql-parser/src/Utils/CLI.php
M libraries/sql-parser/src/Utils/Formatter.php

  Log Message:
  ---
  Update SQL parser

- issue #12026 Fixed parsing of UNION SELECT with brackets

Signed-off-by: Michal Čihař 


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

[phpMyAdmin Git] [phpmyadmin/themes] cc9b61: Update printview.css styles. See f72864cb2b526d44f...

2016-03-19 Thread Michal Čihař 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/themes
  Commit: cc9b6116e8c53d22c29b990b615f8fde99e8fa91
  
https://github.com/phpmyadmin/themes/commit/cc9b6116e8c53d22c29b990b615f8fde99e8fa91
  Author: Madhura Jayaratne 
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
M metro/css/printview.css

  Log Message:
  ---
  Update printview.css styles. See f72864cb2b526d44f39e2d48aaba7ffe34de9d90

Signed-off-by: Madhura Jayaratne 


  Commit: 03b7871ca1d72e23daeba2ab3242ec5355fb927a
  
https://github.com/phpmyadmin/themes/commit/03b7871ca1d72e23daeba2ab3242ec5355fb927a
  Author: Madhura Jayaratne 
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
R metro/jquery/images/ui-bg_flat_0_aa_40x100.png
R metro/jquery/images/ui-bg_flat_75_ff_40x100.png
M metro/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
M metro/jquery/images/ui-bg_glass_65_ff_1x400.png
M metro/jquery/images/ui-bg_glass_75_dadada_1x400.png
M metro/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
M metro/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
M metro/jquery/images/ui-bg_highlight-soft_75_cc_1x100.png
M metro/jquery/images/ui-icons_22_256x240.png
M metro/jquery/images/ui-icons_2e83ff_256x240.png
M metro/jquery/images/ui-icons_454545_256x240.png
M metro/jquery/images/ui-icons_88_256x240.png
M metro/jquery/images/ui-icons_cd0a0a_256x240.png
R metro/jquery/jquery-ui-1.11.2.css
A metro/jquery/jquery-ui-1.11.4.css

  Log Message:
  ---
  Update jQuery UI to 1.11.4, See c6939e9e50cebd1c10ab12df9867267c76b4cc8e

Signed-off-by: Madhura Jayaratne 


  Commit: ce6523563159db7c36be0049601975cc07d66734
  
https://github.com/phpmyadmin/themes/commit/ce6523563159db7c36be0049601975cc07d66734
  Author: Madhura Jayaratne 
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
M metro/css/common.css.php
M metro/layout.inc.php

  Log Message:
  ---
  Merge branch 'master' of github.com:phpmyadmin/themes into update


  Commit: aa0054e6567ba510a485ec37e32535b75b1598c4
  
https://github.com/phpmyadmin/themes/commit/aa0054e6567ba510a485ec37e32535b75b1598c4
  Author: Madhura Jayaratne 
  Date:   2016-03-11 (Fri, 11 Mar 2016)

  Changed paths:
M metro/css/printview.css

  Log Message:
  ---
  Fix styles for print view

Signed-off-by: Madhura Jayaratne 


  Commit: 8599b783289f49753863c89b59d5232018948676
  
https://github.com/phpmyadmin/themes/commit/8599b783289f49753863c89b59d5232018948676
  Author: Michal Čihař 
  Date:   2016-03-17 (Thu, 17 Mar 2016)

  Changed paths:
M metro/css/printview.css
R metro/jquery/images/ui-bg_flat_0_aa_40x100.png
R metro/jquery/images/ui-bg_flat_75_ff_40x100.png
M metro/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
M metro/jquery/images/ui-bg_glass_65_ff_1x400.png
M metro/jquery/images/ui-bg_glass_75_dadada_1x400.png
M metro/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
M metro/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
M metro/jquery/images/ui-bg_highlight-soft_75_cc_1x100.png
M metro/jquery/images/ui-icons_22_256x240.png
M metro/jquery/images/ui-icons_2e83ff_256x240.png
M metro/jquery/images/ui-icons_454545_256x240.png
M metro/jquery/images/ui-icons_88_256x240.png
M metro/jquery/images/ui-icons_cd0a0a_256x240.png
R metro/jquery/jquery-ui-1.11.2.css
A metro/jquery/jquery-ui-1.11.4.css

  Log Message:
  ---
  Merge pull request #11 from madhuracj/update

Update metro theme to be compatible with 4.6.0


Compare: 
https://github.com/phpmyadmin/themes/compare/89cd101b6e2c...8599b783289f___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git