[phpMyAdmin Git] [phpmyadmin/phpmyadmin] a06741: Fix issues with settings icon in nav panel

[Win Barua]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: a067418124c5f710b853bc3648983fecc2a221ba
https://github.com/phpmyadmin/phpmyadmin/commit/a067418124c5f710b853bc3648983fecc2a221ba
Author: Win Barua <win.barua2 at gmail.com>
Date: 2023-04-01 (Sat, 04 April 2023) +01:00

Changed paths: 
M libraries/classes/Controllers/Preferences/TwoFactorController.php
M themes/bootstrap/scss/_common.scss

Log Message:
-----------
Fix issues with settings icon in nav panel

- settings icon still shows in 2FA in all themes.
- bootstrap theme still shows settings icon on all settings tabs.

Signed-off-by: Win Barua <win.barua2 at gmail.com>

Commit: 8c7c87f52454b14071daa61c8f44268a17ce0d92
https://github.com/phpmyadmin/phpmyadmin/commit/8c7c87f52454b14071daa61c8f44268a17ce0d92
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2023-04-12 (Wed, 04 April 2023) -03:00

Changed paths: 
M libraries/classes/Controllers/Preferences/TwoFactorController.php
M themes/bootstrap/scss/_common.scss

Log Message:
-----------
Merge pull request #18308 from win20/navigation-panel-settings-icon-issues

Fix issues with settings icon in nav panel

Commit: 3e7cf7cfabdaeadc1839e1c6f4c6e173c514cfe1
https://github.com/phpmyadmin/phpmyadmin/commit/3e7cf7cfabdaeadc1839e1c6f4c6e173c514cfe1
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2023-04-12 (Wed, 04 April 2023) -03:00

Changed paths: 
M libraries/classes/Controllers/Preferences/TwoFactorController.php
M test/classes/ConfigStorage/RelationTest.php

Log Message:
-----------
Fix failing RelationTest test

Signed-off-by: Maurício Meneghini Fauth <mauricio at fauth.dev>

Commit: 45c7d30093916e1f8affe32a6e73ffee676ff77e
https://github.com/phpmyadmin/phpmyadmin/commit/45c7d30093916e1f8affe32a6e73ffee676ff77e
Author: Maurício Meneghini Fauth <mauricio at fauth.dev>
Date: 2023-04-12 (Wed, 04 April 2023) -03:00

Changed paths: 
M libraries/classes/Controllers/Preferences/TwoFactorController.php
M public/themes/bootstrap/scss/_common.scss

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

Signed-off-by: Maurício Meneghini Fauth <mauricio at fauth.dev>