Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c716102d09ec9672895ba6878dece289be196415
https://github.com/phpmyadmin/phpmyadmin/commit/c716102d09ec9672895ba6878dece289be196415
Author: Erki Aring <e...@example.ee>
Date: 2023-04-14 (Fri, 04 April 2023) +03:00

Changed paths: 
M doc/config.rst
M libraries/classes/Bookmark.php
M libraries/classes/Config/Descriptions.php
M libraries/classes/Config/Forms/Setup/SqlForm.php
M libraries/classes/Config/Settings.php
M libraries/classes/Sql.php
M libraries/classes/SqlQueryForm.php
M psalm-baseline.xml
M psalm.xml
M templates/sql/bookmark.twig
M templates/sql/query.twig
M test/classes/BookmarkTest.php
M test/classes/Config/SettingsTest.php

Log Message:
-----------
Add configuration option to allow shared bookmarks

Signed-off-by: Erki Aring <e...@example.ee>

Commit: 7714cbf39abf85901483352e7c7ecb85d002d04f
https://github.com/phpmyadmin/phpmyadmin/commit/7714cbf39abf85901483352e7c7ecb85d002d04f
Author: Liviu-Mihail Concioiu <liviu.conci...@gmail.com>
Date: 2023-04-21 (Fri, 04 April 2023) +02:00

Changed paths: 
M templates/database/structure/structure_table_row.twig

Log Message:
-----------
Fix colspan number

Signed-off-by: Liviu-Mihail Concioiu <liviu.conci...@gmail.com>

Commit: 5e7717f4c8b6357d30e66a052cb3b8519bbe6048
https://github.com/phpmyadmin/phpmyadmin/commit/5e7717f4c8b6357d30e66a052cb3b8519bbe6048
Author: faissaloux <fwahab...@gmail.com>
Date: 2023-05-06 (Sat, 05 May 2023) +02:00

Changed paths: 
M js/src/database/multi_table_query.js

Log Message:
-----------
fix criteria toggle

Signed-off-by: faissaloux <fwahab...@gmail.com>

Commit: 3e023ca0e3e4846525c0122695289578bd293432
https://github.com/phpmyadmin/phpmyadmin/commit/3e023ca0e3e4846525c0122695289578bd293432
Author: William Desportes <william...@wdes.fr>
Date: 2023-05-06 (Sat, 05 May 2023) +02:00

Changed paths: 
M js/src/database/multi_table_query.js

Log Message:
-----------
Merge #18221 - Keep the criteria box collapsed by the user when un-checking the 
criteria checkbox

Pull-request: #18221

Signed-off-by: William Desportes <william...@wdes.fr>

Commit: 1a146fa1145c18278e3751ca6d87b206f715c04c
https://github.com/phpmyadmin/phpmyadmin/commit/1a146fa1145c18278e3751ca6d87b206f715c04c
Author: William Desportes <william...@wdes.fr>
Date: 2023-05-06 (Sat, 05 May 2023) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for 3e023ca0e3

Ref: 3e023ca0e3e4846525c0122695289578bd293432

Signed-off-by: William Desportes <william...@wdes.fr>

Commit: ecc6c7f3da6a868a9d239e103836faf0f4968c1b
https://github.com/phpmyadmin/phpmyadmin/commit/ecc6c7f3da6a868a9d239e103836faf0f4968c1b
Author: William Desportes <william...@wdes.fr>
Date: 2023-05-06 (Sat, 05 May 2023) +02:00

Changed paths: 
M templates/database/structure/structure_table_row.twig

Log Message:
-----------
Merge #18363 - Fix colspan number for actions column on database table list

Pull-request: #18363

Signed-off-by: William Desportes <william...@wdes.fr>

Commit: 37bd7d981e698399db688e71e0b49547296c8d7c
https://github.com/phpmyadmin/phpmyadmin/commit/37bd7d981e698399db688e71e0b49547296c8d7c
Author: William Desportes <william...@wdes.fr>
Date: 2023-05-06 (Sat, 05 May 2023) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for dca9657432

Ref: dca965743223024407207e807954fa975f4284db

Signed-off-by: William Desportes <william...@wdes.fr>

Commit: 3b4b4e287abac0abc7713eda7598485b4bbfd932
https://github.com/phpmyadmin/phpmyadmin/commit/3b4b4e287abac0abc7713eda7598485b4bbfd932
Author: William Desportes <william...@wdes.fr>
Date: 2023-05-06 (Sat, 05 May 2023) +02:00

Changed paths: 
M .github/workflows/tests.yml

Log Message:
-----------
Fix tests workflow for PSR7 libraries

Ref: 37bd7d981e698399db688e71e0b49547296c8d7c

Signed-off-by: William Desportes <william...@wdes.fr>

Commit: b12b3f28273cdc229476aafb84918e258a5acdf3
https://github.com/phpmyadmin/phpmyadmin/commit/b12b3f28273cdc229476aafb84918e258a5acdf3
Author: William Desportes <william...@wdes.fr>
Date: 2023-05-06 (Sat, 05 May 2023) +02:00

Changed paths: 
M .github/workflows/tests.yml
M ChangeLog
M js/src/database/multi_table_query.ts
M templates/database/structure/structure_table_row.twig

Log Message:
-----------
Merge branch 'QA_5_2'

Signed-off-by: William Desportes <william...@wdes.fr>

Commit: 25bd2ac7118253d8f5bdddb51000ad9b24a01116
https://github.com/phpmyadmin/phpmyadmin/commit/25bd2ac7118253d8f5bdddb51000ad9b24a01116
Author: William Desportes <william...@wdes.fr>
Date: 2023-05-06 (Sat, 05 May 2023) +02:00

Changed paths: 
M doc/config.rst
M libraries/classes/Bookmark.php
M libraries/classes/Config/Descriptions.php
M libraries/classes/Config/Forms/Setup/SqlForm.php
M libraries/classes/Config/Settings.php
M libraries/classes/Sql.php
M libraries/classes/SqlQueryForm.php
M psalm-baseline.xml
M psalm.xml
M templates/sql/bookmark.twig
M templates/sql/query.twig
M test/classes/BookmarkTest.php
M test/classes/Config/SettingsTest.php

Log Message:
-----------
Merge #18223 - Add a configuration option to allow shared bookmarks: 
`$cfg['AllowSharedBookmarks']`

Pull-request: #18223

Signed-off-by: William Desportes <william...@wdes.fr>

Commit: 3156c39492c7d29d789d2e883b94b03ccfd76dda
https://github.com/phpmyadmin/phpmyadmin/commit/3156c39492c7d29d789d2e883b94b03ccfd76dda
Author: William Desportes <william...@wdes.fr>
Date: 2023-05-06 (Sat, 05 May 2023) +02:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for 25bd2ac711

Ref: 25bd2ac7118253d8f5bdddb51000ad9b24a01116
Pull-request: #18223

Signed-off-by: William Desportes <william...@wdes.fr>

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

Reply via email to