[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c6dd6b: Fix phpmyadmin-security#240 Multiple CSRF vulnerab...

2018-04-19 Thread Isaac Bennetch
  Branch: refs/tags/RELEASE_4_8_0_1
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c6dd6b56e236a3aff953cee4135ecaa67130e641
  
https://github.com/phpmyadmin/phpmyadmin/commit/c6dd6b56e236a3aff953cee4135ecaa67130e641
  Author: Madhura Jayaratne 
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities

Signed-off-by: Madhura Jayaratne 


  Commit: b04e4ccbfd4da4a3d02e5215cc030589aca68713
  
https://github.com/phpmyadmin/phpmyadmin/commit/b04e4ccbfd4da4a3d02e5215cc030589aca68713
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Merge pull request #241 from phpmyadmin/bug240

Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities


  Commit: 236b5c9332346ea069c42ba27101dc6c8a6fde89
  
https://github.com/phpmyadmin/phpmyadmin/commit/236b5c9332346ea069c42ba27101dc6c8a6fde89
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Config.php

  Log Message:
  ---
  Prepare for version 4.8.0.1

Signed-off-by: Isaac Bennetch 


  Commit: 81fb6f75621ee2004c9406abdfb5f72de318af33
  
https://github.com/phpmyadmin/phpmyadmin/commit/81fb6f75621ee2004c9406abdfb5f72de318af33
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
A composer.lock

  Log Message:
  ---
  Adding composer lock for 4.8.0.1

Signed-off-by: Isaac Bennetch 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/c6dd6b56e236^...81fb6f75621e___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c6dd6b: Fix phpmyadmin-security#240 Multiple CSRF vulnerab...

2018-04-19 Thread Isaac Bennetch
  Branch: refs/heads/MAINT_4_8_0
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c6dd6b56e236a3aff953cee4135ecaa67130e641
  
https://github.com/phpmyadmin/phpmyadmin/commit/c6dd6b56e236a3aff953cee4135ecaa67130e641
  Author: Madhura Jayaratne 
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities

Signed-off-by: Madhura Jayaratne 


  Commit: b04e4ccbfd4da4a3d02e5215cc030589aca68713
  
https://github.com/phpmyadmin/phpmyadmin/commit/b04e4ccbfd4da4a3d02e5215cc030589aca68713
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Merge pull request #241 from phpmyadmin/bug240

Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities


  Commit: 236b5c9332346ea069c42ba27101dc6c8a6fde89
  
https://github.com/phpmyadmin/phpmyadmin/commit/236b5c9332346ea069c42ba27101dc6c8a6fde89
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Config.php

  Log Message:
  ---
  Prepare for version 4.8.0.1

Signed-off-by: Isaac Bennetch 


  Commit: 81fb6f75621ee2004c9406abdfb5f72de318af33
  
https://github.com/phpmyadmin/phpmyadmin/commit/81fb6f75621ee2004c9406abdfb5f72de318af33
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
A composer.lock

  Log Message:
  ---
  Adding composer lock for 4.8.0.1

Signed-off-by: Isaac Bennetch 


  Commit: e492cca492c98718bd80245e4ffe7a7f307e2b19
  
https://github.com/phpmyadmin/phpmyadmin/commit/e492cca492c98718bd80245e4ffe7a7f307e2b19
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
R composer.lock

  Log Message:
  ---
  Removing composer.lock

Signed-off-by: Isaac Bennetch 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/c6dd6b56e236^...e492cca492c9___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c6dd6b: Fix phpmyadmin-security#240 Multiple CSRF vulnerab...

2018-04-19 Thread Isaac Bennetch
  Branch: refs/heads/QA_4_8
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c6dd6b56e236a3aff953cee4135ecaa67130e641
  
https://github.com/phpmyadmin/phpmyadmin/commit/c6dd6b56e236a3aff953cee4135ecaa67130e641
  Author: Madhura Jayaratne 
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities

Signed-off-by: Madhura Jayaratne 


  Commit: b04e4ccbfd4da4a3d02e5215cc030589aca68713
  
https://github.com/phpmyadmin/phpmyadmin/commit/b04e4ccbfd4da4a3d02e5215cc030589aca68713
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Merge pull request #241 from phpmyadmin/bug240

Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities


  Commit: 236b5c9332346ea069c42ba27101dc6c8a6fde89
  
https://github.com/phpmyadmin/phpmyadmin/commit/236b5c9332346ea069c42ba27101dc6c8a6fde89
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Config.php

  Log Message:
  ---
  Prepare for version 4.8.0.1

Signed-off-by: Isaac Bennetch 


  Commit: 81fb6f75621ee2004c9406abdfb5f72de318af33
  
https://github.com/phpmyadmin/phpmyadmin/commit/81fb6f75621ee2004c9406abdfb5f72de318af33
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
A composer.lock

  Log Message:
  ---
  Adding composer lock for 4.8.0.1

Signed-off-by: Isaac Bennetch 


  Commit: e492cca492c98718bd80245e4ffe7a7f307e2b19
  
https://github.com/phpmyadmin/phpmyadmin/commit/e492cca492c98718bd80245e4ffe7a7f307e2b19
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
R composer.lock

  Log Message:
  ---
  Removing composer.lock

Signed-off-by: Isaac Bennetch 


  Commit: a26644de5ad1d742f387fc11317596311c176249
  
https://github.com/phpmyadmin/phpmyadmin/commit/a26644de5ad1d742f387fc11317596311c176249
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Config.php
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Merge branch 'MAINT_4_8_0' into QA_4_8


  Commit: 2cc861f0a3304c49cdc3566fe4ccd4de778f8332
  
https://github.com/phpmyadmin/phpmyadmin/commit/2cc861f0a3304c49cdc3566fe4ccd4de778f8332
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Config.php

  Log Message:
  ---
  Prepare for 4.8.1-dev

Signed-off-by: Isaac Bennetch 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/b2c79ae39fe6...2cc861f0a330___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 22233f: Prepare for 4.8.1-dev

2018-04-19 Thread Isaac Bennetch
  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 22233f72a5fd59198b99a2a92967c9a8b1aab068
  
https://github.com/phpmyadmin/phpmyadmin/commit/22233f72a5fd59198b99a2a92967c9a8b1aab068
  Author: Isaac Bennetch 
  Date:   2018-04-08 (Sun, 08 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Config.php

  Log Message:
  ---
  Prepare for 4.8.1-dev

Signed-off-by: Isaac Bennetch 


  Commit: 1707052e61e5b00f5a1521c62ca38bbd099462f3
  
https://github.com/phpmyadmin/phpmyadmin/commit/1707052e61e5b00f5a1521c62ca38bbd099462f3
  Author: Vladimir Travkin 
  Date:   2018-04-08 (Sun, 08 Apr 2018)

  Changed paths:
M po/ru.po

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

Currently translated at 98.1% (3228 of 3288 strings)

[CI skip]


  Commit: e787b060252abde677b397ad3e6ec2996a3a5eff
  
https://github.com/phpmyadmin/phpmyadmin/commit/e787b060252abde677b397ad3e6ec2996a3a5eff
  Author: Weblate 
  Date:   2018-04-08 (Sun, 08 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Config.php

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


  Commit: 8371ab1dae8dfa1985557ee25a617abc7d54c625
  
https://github.com/phpmyadmin/phpmyadmin/commit/8371ab1dae8dfa1985557ee25a617abc7d54c625
  Author: Yaron Shahrabani 
  Date:   2018-04-08 (Sun, 08 Apr 2018)

  Changed paths:
M po/he.po

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

Currently translated at 23.5% (773 of 3288 strings)

[CI skip]


  Commit: b3e070970a7169e1a49bd4b9f979687649501177
  
https://github.com/phpmyadmin/phpmyadmin/commit/b3e070970a7169e1a49bd4b9f979687649501177
  Author: Yaron Shahrabani 
  Date:   2018-04-08 (Sun, 08 Apr 2018)

  Changed paths:
M po/he.po

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

Currently translated at 23.8% (783 of 3288 strings)

[CI skip]


  Commit: b88d5036f9fd46a6ba9375b718e857b1bb4ebb2c
  
https://github.com/phpmyadmin/phpmyadmin/commit/b88d5036f9fd46a6ba9375b718e857b1bb4ebb2c
  Author: Yaron Shahrabani 
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
M po/he.po

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

Currently translated at 24.1% (793 of 3288 strings)

[CI skip]


  Commit: 27b02fe68b70ef6279268e92894e43319abbaee0
  
https://github.com/phpmyadmin/phpmyadmin/commit/27b02fe68b70ef6279268e92894e43319abbaee0
  Author: Master3395 
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
M po/nb.po

  Log Message:
  ---
  Translated using Weblate (Norwegian Bokmål)

Currently translated at 55.6% (1831 of 3288 strings)

[CI skip]


  Commit: b42b64683fa12d510ec1c7c4f9f1e2ba4015d95b
  
https://github.com/phpmyadmin/phpmyadmin/commit/b42b64683fa12d510ec1c7c4f9f1e2ba4015d95b
  Author: Allan Nordhøy 
  Date:   2018-04-12 (Thu, 12 Apr 2018)

  Changed paths:
M po/nb.po

  Log Message:
  ---
  Translated using Weblate (Norwegian Bokmål)

Currently translated at 55.6% (1831 of 3288 strings)

[CI skip]


  Commit: 4720ed7cf2b27b7bedfe0b61088a9544d0830153
  
https://github.com/phpmyadmin/phpmyadmin/commit/4720ed7cf2b27b7bedfe0b61088a9544d0830153
  Author: Yaron Shahrabani 
  Date:   2018-04-14 (Sat, 14 Apr 2018)

  Changed paths:
M po/he.po

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

Currently translated at 26.7% (879 of 3288 strings)

[CI skip]


  Commit: 466eb7b519ebef8a6acadbbabe0257b108810d31
  
https://github.com/phpmyadmin/phpmyadmin/commit/466eb7b519ebef8a6acadbbabe0257b108810d31
  Author: Florian Knodt 
  Date:   2018-04-14 (Sat, 14 Apr 2018)

  Changed paths:
M po/de.po

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

Currently translated at 98.6% (3242 of 3288 strings)

[CI skip]


  Commit: 342fe4fe5859fd0e79ed260789d8d14628de037c
  
https://github.com/phpmyadmin/phpmyadmin/commit/342fe4fe5859fd0e79ed260789d8d14628de037c
  Author: anonymous <>
  Date:   2018-04-15 (Sun, 15 Apr 2018)

  Changed paths:
M po/fr.po

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

Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]


  Commit: 55ce1dddfe6195183dc012321a36fe340b7b6fe0
  
https://github.com/phpmyadmin/phpmyadmin/commit/55ce1dddfe6195183dc012321a36fe340b7b6fe0
  Author: Orkhan Guliyev 
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
M po/az.po

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

Currently translated at 50.1% (1648 of 3288 strings)

[CI skip]


  Commit: 2f7fca601f852dd236f4ba961725a0fb3e4d8101
  
https://github.com/phpmyadmin/phpmyadmin/commit/2f7fca601f852dd236f4ba961725a0fb3e4d8101
  Author: Yaron Shahrabani 
  Date:   2018-04-16 (Mon, 16 Apr 2018)

  Changed paths:
M po/ar.po

  Log Message:
  ---
  Translated using Weblate (Ar

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 8ea45f: Translated using Weblate (Romanian)

2018-04-19 Thread Weblate via Git
  Branch: refs/heads/QA_4_8
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8ea45f29b988c3c4d8afb943f6e35c4b82707fe3
  
https://github.com/phpmyadmin/phpmyadmin/commit/8ea45f29b988c3c4d8afb943f6e35c4b82707fe3
  Author: S.C. MEGAHOST S.R.L 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M po/ro.po

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

Currently translated at 0.0% (0 of 3288 strings)

[CI skip]


  Commit: fbe93e63c00decdc76997156278d5c8ba54b1d28
  
https://github.com/phpmyadmin/phpmyadmin/commit/fbe93e63c00decdc76997156278d5c8ba54b1d28
  Author: Weblate 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/2cc861f0a330...fbe93e63c00d___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c6dd6b: Fix phpmyadmin-security#240 Multiple CSRF vulnerab...

2018-04-19 Thread Isaac Bennetch
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c6dd6b56e236a3aff953cee4135ecaa67130e641
  
https://github.com/phpmyadmin/phpmyadmin/commit/c6dd6b56e236a3aff953cee4135ecaa67130e641
  Author: Madhura Jayaratne 
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities

Signed-off-by: Madhura Jayaratne 


  Commit: b2c79ae39fe6f459b75f6bc67bd42b82d4e8
  
https://github.com/phpmyadmin/phpmyadmin/commit/b2c79ae39fe6f459b75f6bc67bd42b82d4e8
  Author: S.C. MEGAHOST S.R.L 
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
M po/ro.po

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

Currently translated at 50.9% (1675 of 3288 strings)

[CI skip]


  Commit: b04e4ccbfd4da4a3d02e5215cc030589aca68713
  
https://github.com/phpmyadmin/phpmyadmin/commit/b04e4ccbfd4da4a3d02e5215cc030589aca68713
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Merge pull request #241 from phpmyadmin/bug240

Fix phpmyadmin-security#240 Multiple CSRF vulnerabilities


  Commit: 236b5c9332346ea069c42ba27101dc6c8a6fde89
  
https://github.com/phpmyadmin/phpmyadmin/commit/236b5c9332346ea069c42ba27101dc6c8a6fde89
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Config.php

  Log Message:
  ---
  Prepare for version 4.8.0.1

Signed-off-by: Isaac Bennetch 


  Commit: 81fb6f75621ee2004c9406abdfb5f72de318af33
  
https://github.com/phpmyadmin/phpmyadmin/commit/81fb6f75621ee2004c9406abdfb5f72de318af33
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
A composer.lock

  Log Message:
  ---
  Adding composer lock for 4.8.0.1

Signed-off-by: Isaac Bennetch 


  Commit: e492cca492c98718bd80245e4ffe7a7f307e2b19
  
https://github.com/phpmyadmin/phpmyadmin/commit/e492cca492c98718bd80245e4ffe7a7f307e2b19
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
R composer.lock

  Log Message:
  ---
  Removing composer.lock

Signed-off-by: Isaac Bennetch 


  Commit: a26644de5ad1d742f387fc11317596311c176249
  
https://github.com/phpmyadmin/phpmyadmin/commit/a26644de5ad1d742f387fc11317596311c176249
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Config.php
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Merge branch 'MAINT_4_8_0' into QA_4_8


  Commit: 2cc861f0a3304c49cdc3566fe4ccd4de778f8332
  
https://github.com/phpmyadmin/phpmyadmin/commit/2cc861f0a3304c49cdc3566fe4ccd4de778f8332
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Config.php

  Log Message:
  ---
  Prepare for 4.8.1-dev

Signed-off-by: Isaac Bennetch 


  Commit: fc5992686e0407172e9f664ea74732e5891714cf
  
https://github.com/phpmyadmin/phpmyadmin/commit/fc5992686e0407172e9f664ea74732e5891714cf
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog
M js/db_operations.js
M js/tbl_operations.js
M libraries/classes/Operations.php
M sql.php

  Log Message:
  ---
  Fix merge conflicts

Signed-off-by: Isaac Bennetch 


  Commit: feda69b4653ae6f575402dfed52cf8803ea98a76
  
https://github.com/phpmyadmin/phpmyadmin/commit/feda69b4653ae6f575402dfed52cf8803ea98a76
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Log Message:
  ---
  Merge commit 'b2c79ae39f'


  Commit: 312274300d9b620bb4d57d8fefd13d5c4b6b7617
  
https://github.com/phpmyadmin/phpmyadmin/commit/312274300d9b620bb4d57d8fefd13d5c4b6b7617
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Log Message:
  ---
  Merge commit 'b04e4ccbfd'


  Commit: 58ed8a75c676b016cb3dfe07dd8108af9c0e8aa1
  
https://github.com/phpmyadmin/phpmyadmin/commit/58ed8a75c676b016cb3dfe07dd8108af9c0e8aa1
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Fix merge conflicts

Signed-off-by: Isaac Bennetch 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/ea5c066d5ddc...58ed8a75c676___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/docker] 316a23: Update to 4.8.0.1

2018-04-19 Thread Isaac Bennetch
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: 316a237509ec9fc3c43e64c605a52fc1d711a5a1
  
https://github.com/phpmyadmin/docker/commit/316a237509ec9fc3c43e64c605a52fc1d711a5a1
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  Update to 4.8.0.1

Signed-off-by: Isaac Bennetch 


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


[phpMyAdmin Git] [phpmyadmin/docker] 316a23: Update to 4.8.0.1

2018-04-19 Thread Isaac Bennetch
  Branch: refs/tags/4.8.0.1
  Home:   https://github.com/phpmyadmin/docker
  Commit: 316a237509ec9fc3c43e64c605a52fc1d711a5a1
  
https://github.com/phpmyadmin/docker/commit/316a237509ec9fc3c43e64c605a52fc1d711a5a1
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M Dockerfile

  Log Message:
  ---
  Update to 4.8.0.1

Signed-off-by: Isaac Bennetch 


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


[phpMyAdmin Git] [phpmyadmin/docker]

2018-04-19 Thread ibennetch
  Branch: refs/tags/4.8.0.1
  Home:   https://github.com/phpmyadmin/docker
___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2efd1a: Release documentation: encourage signing Docker re...

2018-04-19 Thread Isaac Bennetch
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2efd1a3e46f6330ea197981c4bfdaf6f4f89f268
  
https://github.com/phpmyadmin/phpmyadmin/commit/2efd1a3e46f6330ea197981c4bfdaf6f4f89f268
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M scripts/create-release.sh

  Log Message:
  ---
  Release documentation: encourage signing Docker releases

Signed-off-by: Isaac Bennetch 


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


[phpMyAdmin Git] [phpmyadmin/localized_docs] 0f0341: Translated using Weblate (Romanian)

2018-04-19 Thread S.C. MEGAHOST S.R.L
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/localized_docs
  Commit: 0f0341bb86a340d0658ea3fe4e357b7277b0c50d
  
https://github.com/phpmyadmin/localized_docs/commit/0f0341bb86a340d0658ea3fe4e357b7277b0c50d
  Author: S.C. MEGAHOST S.R.L 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

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

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

Currently translated at 3.3% (85 of 2501 strings)

[CI skip]


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


[phpMyAdmin Git] [phpmyadmin/scripts] 161def: Fix for regex not detecting tags for security fixe...

2018-04-19 Thread Isaac Bennetch
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/scripts
  Commit: 161defdd084c4c2b00d8baa22a4fd04cf75416e1
  
https://github.com/phpmyadmin/scripts/commit/161defdd084c4c2b00d8baa22a4fd04cf75416e1
  Author: Isaac Bennetch 
  Date:   2018-04-19 (Thu, 19 Apr 2018)

  Changed paths:
M website/daily-composer

  Log Message:
  ---
  Fix for regex not detecting tags for security fixes (such as 4.8.0.1)

Signed-off-by: Isaac Bennetch 


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