Branch: refs/heads/QA_5_2
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c851c70f86e74e0b4362afe3c7fc07fa156ba0f8
https://github.com/phpmyadmin/phpmyadmin/commit/c851c70f86e74e0b4362afe3c7fc07fa156ba0f8
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2025-01-20 (Mon, 01 January 2025) -05:00

Changed paths: 

Log Message:
-----------
Fix merge conflicts

Signed-off-by: Isaac Bennetch <benne...@gmail.com>

Commit: 8aa2ca9108afcf83d7491236b419ab7e8c4e938f
https://github.com/phpmyadmin/phpmyadmin/commit/8aa2ca9108afcf83d7491236b419ab7e8c4e938f
Author: Maurício Meneghini Fauth <mauri...@mfauth.net>
Date: 2025-01-20 (Mon, 01 January 2025) -05:00

Changed paths: 
M libraries/classes/ErrorHandler.php

Log Message:
-----------
Hide Error exception messages when not in dev env

Signed-off-by: Maurício Meneghini Fauth <mauri...@mfauth.net>

Commit: cf886df108fe8a7282efde95f1b014535ac33878
https://github.com/phpmyadmin/phpmyadmin/commit/cf886df108fe8a7282efde95f1b014535ac33878
Author: Maurício Meneghini Fauth <mauri...@mfauth.net>
Date: 2025-01-20 (Mon, 01 January 2025) -05:00

Changed paths: 
M libraries/classes/Controllers/Server/Databases/DestroyController.php
M phpstan-baseline.neon
M psalm-baseline.xml

Log Message:
-----------
Ignore system databases when deleting using UI

Signed-off-by: Maurício Meneghini Fauth <mauri...@mfauth.net>

Commit: 23c13a81709728089ff031e5b1c29b5e91baa6a7
https://github.com/phpmyadmin/phpmyadmin/commit/23c13a81709728089ff031e5b1c29b5e91baa6a7
Author: Maurício Meneghini Fauth <mauri...@mfauth.net>
Date: 2025-01-20 (Mon, 01 January 2025) -05:00

Changed paths: 
M libraries/classes/Table/Maintenance.php

Log Message:
-----------
Fix unescaped table name when checking tables

Signed-off-by: Maurício Meneghini Fauth <mauri...@mfauth.net>

Commit: 7355ddff8d1da9453cf43c09a45666157b16103d
https://github.com/phpmyadmin/phpmyadmin/commit/7355ddff8d1da9453cf43c09a45666157b16103d
Author: Maurício Meneghini Fauth <mauri...@mfauth.net>
Date: 2025-01-20 (Mon, 01 January 2025) -05:00

Changed paths: 
M libraries/classes/InsertEdit.php
M psalm-baseline.xml
M test/classes/InsertEditTest.php

Log Message:
-----------
Fix XSS vulnerability on Insert page

Signed-off-by: Maurício Meneghini Fauth <mauri...@mfauth.net>

Commit: e6f08a8682ab6a50be973645d31d90c8830bf1ba
https://github.com/phpmyadmin/phpmyadmin/commit/e6f08a8682ab6a50be973645d31d90c8830bf1ba
Author: Maurício Meneghini Fauth <mauri...@mfauth.net>
Date: 2025-01-20 (Mon, 01 January 2025) -05:00

Changed paths: 
M libraries/classes/Controllers/Export/ExportController.php
M libraries/classes/Controllers/Import/ImportController.php
M libraries/classes/Encoding.php
M phpstan-baseline.neon
M psalm-baseline.xml
M test/classes/EncodingTest.php

Log Message:
-----------
Ignore ISO-2022-CN-EXT charset for iconv

Fixes possible glibc/iconv vulnerability (CVE-2024-2961).

Signed-off-by: Maurício Meneghini Fauth <mauri...@mfauth.net>

Commit: 71334d4c4b6e40f38e5cb7a255ea4d9967bf63d7
https://github.com/phpmyadmin/phpmyadmin/commit/71334d4c4b6e40f38e5cb7a255ea4d9967bf63d7
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2025-01-20 (Mon, 01 January 2025) -05:00

Changed paths: 
M ChangeLog

Log Message:
-----------
ChangeLog for security work

Signed-off-by: Isaac Bennetch <benne...@gmail.com>

Commit: 37b03ea30b5d364933f5bb0508cb7ad2b9bc0768
https://github.com/phpmyadmin/phpmyadmin/commit/37b03ea30b5d364933f5bb0508cb7ad2b9bc0768
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2025-01-20 (Mon, 01 January 2025) -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.2

Signed-off-by: Isaac Bennetch <benne...@gmail.com>

Commit: 59583e2f19c06f1a3a55dce3a87c85d8272ab105
https://github.com/phpmyadmin/phpmyadmin/commit/59583e2f19c06f1a3a55dce3a87c85d8272ab105
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2025-01-20 (Mon, 01 January 2025) -05:00

Changed paths: 
A composer.lock

Log Message:
-----------
Adding composer lock for 5.2.2

Signed-off-by: Isaac Bennetch <benne...@gmail.com>

Commit: 9fd19934143b8d8fd4759cb09e24a09bb05e244b
https://github.com/phpmyadmin/phpmyadmin/commit/9fd19934143b8d8fd4759cb09e24a09bb05e244b
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2025-01-20 (Mon, 01 January 2025) -05:00

Changed paths: 
D composer.lock

Log Message:
-----------
Removing composer.lock

Signed-off-by: Isaac Bennetch <benne...@gmail.com>

_______________________________________________
Git mailing list -- git@phpmyadmin.net
To unsubscribe send an email to git-le...@phpmyadmin.net

Reply via email to