[phpMyAdmin Git] [phpmyadmin/docker] b03053: Fix Docker build where rm would error because of a missing folder

2023-02-07 Thread Isaac Bennetch
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/docker
Commit: b0305371a48c72b78f36b34105cb161758e3366b
https://github.com/phpmyadmin/docker/commit/b0305371a48c72b78f36b34105cb161758e3366b
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M Dockerfile-alpine.template
M Dockerfile-debian.template

Log Message:
---
Fix Docker build where rm would error because of a missing folder

Signed-off-by: Isaac Bennetch 

Commit: a1772debe412415732d97e0ca195b2ad554ed37f
https://github.com/phpmyadmin/docker/commit/a1772debe412415732d97e0ca195b2ad554ed37f
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M apache/Dockerfile
M fpm-alpine/Dockerfile
M fpm/Dockerfile

Log Message:
---
Releasing 5.2.1 again

Signed-off-by: Isaac Bennetch 

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


[phpMyAdmin Git] [phpmyadmin/docker] 124142: Update to 5.2.1 release

2023-02-07 Thread Isaac Bennetch
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/docker
Commit: 1241428f9992d1274c3e3baed85451c76d538ed5
https://github.com/phpmyadmin/docker/commit/1241428f9992d1274c3e3baed85451c76d538ed5
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M apache/Dockerfile
M fpm-alpine/Dockerfile
M fpm/Dockerfile

Log Message:
---
Update to 5.2.1 release

Signed-off-by: Isaac Bennetch 

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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] efa240: Fix not escaped title when using drag and drop upload

2023-02-07 Thread Maurício Meneghini Fauth
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: efa2406695551667f726497750d3db91fb6f662e
https://github.com/phpmyadmin/phpmyadmin/commit/efa2406695551667f726497750d3db91fb6f662e
Author: Maurício Meneghini Fauth 
Date: 2022-08-05 (Fri, 08 August 2022) -03:00

Changed paths: 
M js/src/drag_drop_import.js

Log Message:
---
Fix not escaped title when using drag and drop upload

Signed-off-by: Maurício Meneghini Fauth 

Commit: e44a56ffb2bc2ffc10552684438fd86a7c80
https://github.com/phpmyadmin/phpmyadmin/commit/e44a56ffb2bc2ffc10552684438fd86a7c80
Author: JL Pilgram 
Date: 2023-02-02 (Thu, 02 February 2023) +01:00

Changed paths: 
M po/it.po

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

Currently translated at 99.8% (3422 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/it/
Signed-off-by: JL Pilgram 

Commit: 909294300e836f41fed9b2681b031dee92642095
https://github.com/phpmyadmin/phpmyadmin/commit/909294300e836f41fed9b2681b031dee92642095
Author: Masahiro Fujimoto 
Date: 2023-02-02 (Thu, 02 February 2023) +01:00

Changed paths: 
M po/ja.po

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

Currently translated at 100.0% (3427 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ja/
Signed-off-by: Masahiro Fujimoto 

Commit: e95c377de9e164b5630425afd80bfebb7c0f9508
https://github.com/phpmyadmin/phpmyadmin/commit/e95c377de9e164b5630425afd80bfebb7c0f9508
Author: Kristijan Fremen Velkovski 
Date: 2023-02-02 (Thu, 02 February 2023) +01:00

Changed paths: 
M po/mk.po

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

Currently translated at 26.1% (897 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: Kristijan Fremen Velkovski 

Commit: 185f5219d34271ecf411c4ee5d0e934fc92014b7
https://github.com/phpmyadmin/phpmyadmin/commit/185f5219d34271ecf411c4ee5d0e934fc92014b7
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/src/drag_drop_import.js

Log Message:
---
Merge pull request #345 from phpmyadmin/sec/343/52

[5.2] Fix not escaped title when using drag and drop upload

Commit: c3460a7f044ca6c48ae1849cab0374542154c9ca
https://github.com/phpmyadmin/phpmyadmin/commit/c3460a7f044ca6c48ae1849cab0374542154c9ca
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 

Log Message:
---
Merge branch 'QA_5_2'

Commit: e9b1db6b10a786fdbbc3d5d3b8c26795bf19eb54
https://github.com/phpmyadmin/phpmyadmin/commit/e9b1db6b10a786fdbbc3d5d3b8c26795bf19eb54
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/src/drag_drop_import.js

Log Message:
---
Merge remote-tracking branch 'security/QA_5_2-security' into QA_5_2

Commit: cc715676b34cda504bc322af1bea0fbe4761252d
https://github.com/phpmyadmin/phpmyadmin/commit/cc715676b34cda504bc322af1bea0fbe4761252d
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M ChangeLog

Log Message:
---
Add ChangeLog entry for security fix PMASA-2023-01

Signed-off-by: Isaac Bennetch 

Commit: 372185c30205962d33bfcb6b0b3e7e3a1997377b
https://github.com/phpmyadmin/phpmyadmin/commit/372185c30205962d33bfcb6b0b3e7e3a1997377b
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Version.php
M package.json

Log Message:
---
Prepare for version 5.2.1

Signed-off-by: Isaac Bennetch 

Commit: 11e127f3fa64adb099d765c4cae6de026954068c
https://github.com/phpmyadmin/phpmyadmin/commit/11e127f3fa64adb099d765c4cae6de026954068c
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
A composer.lock

Log Message:
---
Adding composer lock for 5.2.1

Signed-off-by: Isaac Bennetch 

Commit: d5db011a7482b100c1a975f0c05a83666fb60aa6
https://github.com/phpmyadmin/phpmyadmin/commit/d5db011a7482b100c1a975f0c05a83666fb60aa6
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
D composer.lock

Log Message:
---
Removing composer.lock

Signed-off-by: Isaac Bennetch 

Commit: 43de7826e1d36aabf4e2602b2ec2c810b5a06748
https://github.com/phpmyadmin/phpmyadmin/commit/43de7826e1d36aabf4e2602b2ec2c810b5a06748
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M ChangeLog
M js/src/drag_drop_import.js

Log Message:
---
Fix merge conflicts

Signed-off-by: Isaac Bennetch 

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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] efa240: Fix not escaped title when using drag and drop upload

2023-02-07 Thread Maurício Meneghini Fauth
Branch: refs/heads/QA_5_2
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: efa2406695551667f726497750d3db91fb6f662e
https://github.com/phpmyadmin/phpmyadmin/commit/efa2406695551667f726497750d3db91fb6f662e
Author: Maurício Meneghini Fauth 
Date: 2022-08-05 (Fri, 08 August 2022) -03:00

Changed paths: 
M js/src/drag_drop_import.js

Log Message:
---
Fix not escaped title when using drag and drop upload

Signed-off-by: Maurício Meneghini Fauth 

Commit: 185f5219d34271ecf411c4ee5d0e934fc92014b7
https://github.com/phpmyadmin/phpmyadmin/commit/185f5219d34271ecf411c4ee5d0e934fc92014b7
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/src/drag_drop_import.js

Log Message:
---
Merge pull request #345 from phpmyadmin/sec/343/52

[5.2] Fix not escaped title when using drag and drop upload

Commit: e9b1db6b10a786fdbbc3d5d3b8c26795bf19eb54
https://github.com/phpmyadmin/phpmyadmin/commit/e9b1db6b10a786fdbbc3d5d3b8c26795bf19eb54
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/src/drag_drop_import.js

Log Message:
---
Merge remote-tracking branch 'security/QA_5_2-security' into QA_5_2

Commit: cc715676b34cda504bc322af1bea0fbe4761252d
https://github.com/phpmyadmin/phpmyadmin/commit/cc715676b34cda504bc322af1bea0fbe4761252d
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M ChangeLog

Log Message:
---
Add ChangeLog entry for security fix PMASA-2023-01

Signed-off-by: Isaac Bennetch 

Commit: 372185c30205962d33bfcb6b0b3e7e3a1997377b
https://github.com/phpmyadmin/phpmyadmin/commit/372185c30205962d33bfcb6b0b3e7e3a1997377b
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Version.php
M package.json

Log Message:
---
Prepare for version 5.2.1

Signed-off-by: Isaac Bennetch 

Commit: 11e127f3fa64adb099d765c4cae6de026954068c
https://github.com/phpmyadmin/phpmyadmin/commit/11e127f3fa64adb099d765c4cae6de026954068c
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
A composer.lock

Log Message:
---
Adding composer lock for 5.2.1

Signed-off-by: Isaac Bennetch 

Commit: d5db011a7482b100c1a975f0c05a83666fb60aa6
https://github.com/phpmyadmin/phpmyadmin/commit/d5db011a7482b100c1a975f0c05a83666fb60aa6
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
D composer.lock

Log Message:
---
Removing composer.lock

Signed-off-by: Isaac Bennetch 

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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 53f70f: Fix not escaped title when using drag and drop upload

2023-02-07 Thread Maurício Meneghini Fauth
Branch: refs/heads/QA_4_9
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 53f70fd7f3b388639922e6cc1ca51fbe890c91cc
https://github.com/phpmyadmin/phpmyadmin/commit/53f70fd7f3b388639922e6cc1ca51fbe890c91cc
Author: Maurício Meneghini Fauth 
Date: 2022-08-05 (Fri, 08 August 2022) -03:00

Changed paths: 
M js/common.js

Log Message:
---
Fix not escaped title when using drag and drop upload

Signed-off-by: Maurício Meneghini Fauth 

Commit: 0f685d8a455e6505f33b8ab4c0e6707bcbcb64ff
https://github.com/phpmyadmin/phpmyadmin/commit/0f685d8a455e6505f33b8ab4c0e6707bcbcb64ff
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/common.js

Log Message:
---
Merge pull request #344 from phpmyadmin/sec/343/49

[4.9] Fix not escaped title when using drag and drop upload

Commit: 51301e46370ecfec5ba2c8a925ef72c20ca0c033
https://github.com/phpmyadmin/phpmyadmin/commit/51301e46370ecfec5ba2c8a925ef72c20ca0c033
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/common.js

Log Message:
---
Merge remote-tracking branch 'security/QA_4_9-security' into QA_4_9

Commit: f1047bc018079214594983a1cb6669efaa8b9bf4
https://github.com/phpmyadmin/phpmyadmin/commit/f1047bc018079214594983a1cb6669efaa8b9bf4
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

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

Log Message:
---
Prepare for 4.9.11

Signed-off-by: Isaac Bennetch 

Commit: eca95233a1bffc93d4636a0b42acc9db835976af
https://github.com/phpmyadmin/phpmyadmin/commit/eca95233a1bffc93d4636a0b42acc9db835976af
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
A composer.lock

Log Message:
---
Adding composer lock for 4.9.11

Signed-off-by: Isaac Bennetch 

Commit: 5a4cbbdaf31fbf44834016bad35369d7ccc5a519
https://github.com/phpmyadmin/phpmyadmin/commit/5a4cbbdaf31fbf44834016bad35369d7ccc5a519
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
D composer.lock

Log Message:
---
Removing composer.lock

Signed-off-by: Isaac Bennetch 

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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 53f70f: Fix not escaped title when using drag and drop upload

2023-02-07 Thread Maurício Meneghini Fauth
Branch: refs/tags/RELEASE_4_9_11
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 53f70fd7f3b388639922e6cc1ca51fbe890c91cc
https://github.com/phpmyadmin/phpmyadmin/commit/53f70fd7f3b388639922e6cc1ca51fbe890c91cc
Author: Maurício Meneghini Fauth 
Date: 2022-08-05 (Fri, 08 August 2022) -03:00

Changed paths: 
M js/common.js

Log Message:
---
Fix not escaped title when using drag and drop upload

Signed-off-by: Maurício Meneghini Fauth 

Commit: 0f685d8a455e6505f33b8ab4c0e6707bcbcb64ff
https://github.com/phpmyadmin/phpmyadmin/commit/0f685d8a455e6505f33b8ab4c0e6707bcbcb64ff
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/common.js

Log Message:
---
Merge pull request #344 from phpmyadmin/sec/343/49

[4.9] Fix not escaped title when using drag and drop upload

Commit: 51301e46370ecfec5ba2c8a925ef72c20ca0c033
https://github.com/phpmyadmin/phpmyadmin/commit/51301e46370ecfec5ba2c8a925ef72c20ca0c033
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/common.js

Log Message:
---
Merge remote-tracking branch 'security/QA_4_9-security' into QA_4_9

Commit: f1047bc018079214594983a1cb6669efaa8b9bf4
https://github.com/phpmyadmin/phpmyadmin/commit/f1047bc018079214594983a1cb6669efaa8b9bf4
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

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

Log Message:
---
Prepare for 4.9.11

Signed-off-by: Isaac Bennetch 

Commit: eca95233a1bffc93d4636a0b42acc9db835976af
https://github.com/phpmyadmin/phpmyadmin/commit/eca95233a1bffc93d4636a0b42acc9db835976af
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
A composer.lock

Log Message:
---
Adding composer lock for 4.9.11

Signed-off-by: Isaac Bennetch 

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


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] efa240: Fix not escaped title when using drag and drop upload

2023-02-07 Thread Maurício Meneghini Fauth
Branch: refs/tags/RELEASE_5_2_1
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: efa2406695551667f726497750d3db91fb6f662e
https://github.com/phpmyadmin/phpmyadmin/commit/efa2406695551667f726497750d3db91fb6f662e
Author: Maurício Meneghini Fauth 
Date: 2022-08-05 (Fri, 08 August 2022) -03:00

Changed paths: 
M js/src/drag_drop_import.js

Log Message:
---
Fix not escaped title when using drag and drop upload

Signed-off-by: Maurício Meneghini Fauth 

Commit: 185f5219d34271ecf411c4ee5d0e934fc92014b7
https://github.com/phpmyadmin/phpmyadmin/commit/185f5219d34271ecf411c4ee5d0e934fc92014b7
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/src/drag_drop_import.js

Log Message:
---
Merge pull request #345 from phpmyadmin/sec/343/52

[5.2] Fix not escaped title when using drag and drop upload

Commit: e9b1db6b10a786fdbbc3d5d3b8c26795bf19eb54
https://github.com/phpmyadmin/phpmyadmin/commit/e9b1db6b10a786fdbbc3d5d3b8c26795bf19eb54
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M js/src/drag_drop_import.js

Log Message:
---
Merge remote-tracking branch 'security/QA_5_2-security' into QA_5_2

Commit: cc715676b34cda504bc322af1bea0fbe4761252d
https://github.com/phpmyadmin/phpmyadmin/commit/cc715676b34cda504bc322af1bea0fbe4761252d
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M ChangeLog

Log Message:
---
Add ChangeLog entry for security fix PMASA-2023-01

Signed-off-by: Isaac Bennetch 

Commit: 372185c30205962d33bfcb6b0b3e7e3a1997377b
https://github.com/phpmyadmin/phpmyadmin/commit/372185c30205962d33bfcb6b0b3e7e3a1997377b
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
M ChangeLog
M README
M doc/conf.py
M libraries/classes/Version.php
M package.json

Log Message:
---
Prepare for version 5.2.1

Signed-off-by: Isaac Bennetch 

Commit: 11e127f3fa64adb099d765c4cae6de026954068c
https://github.com/phpmyadmin/phpmyadmin/commit/11e127f3fa64adb099d765c4cae6de026954068c
Author: Isaac Bennetch 
Date: 2023-02-07 (Tue, 02 February 2023) -05:00

Changed paths: 
A composer.lock

Log Message:
---
Adding composer lock for 5.2.1

Signed-off-by: Isaac Bennetch 

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