[PR #1440] [MERGED] feature/subscription settings page #2351

Closed
opened 2026-10-13 21:21:12 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/1440
Author: @Nethius
Created: 2/28/2025
Status: ✅ Merged
Merged: 2/28/2025
Merged by: @Nethius

Base: dev ← Head: feature/subscription-settings-page


📝 Commits (4)

  • b352a6c bugfix: fixed shouldBypassProxy() check
  • a336db6 feature: added page to revoke active devices
  • cf8dad5 feature: added a warning that worker has been updated on the backend
  • 9c4cba9 chore: minor ui fixes

📊 Changes

23 files changed (+461 additions, -76 deletions)

View changed files

📝 CMakeLists.txt (+2 -2)
📝 client/core/controllers/coreController.cpp (+5 -1)
📝 client/core/controllers/coreController.h (+3 -1)
📝 client/core/controllers/gatewayController.cpp (+1 -1)
➕ client/images/controls/monitor.svg (+5 -0)
📝 client/resources.qrc (+2 -0)
📝 client/ui/controllers/api/apiConfigsController.cpp (+39 -1)
📝 client/ui/controllers/api/apiConfigsController.h (+1 -0)
📝 client/ui/controllers/api/apiSettingsController.cpp (+8 -0)
📝 client/ui/controllers/api/apiSettingsController.h (+5 -2)
📝 client/ui/controllers/pageController.h (+1 -0)
📝 client/ui/models/api/apiAccountInfoModel.cpp (+14 -0)
📝 client/ui/models/api/apiAccountInfoModel.h (+2 -1)
📝 client/ui/models/api/apiCountryModel.cpp (+4 -0)
📝 client/ui/models/api/apiCountryModel.h (+2 -1)
➕ client/ui/models/api/apiDevicesModel.cpp (+90 -0)
➕ client/ui/models/api/apiDevicesModel.h (+52 -0)
📝 client/ui/qml/Modules/Style/AmneziaStyle.qml (+1 -0)
➕ client/ui/qml/Pages2/PageSettingsApiDevices.qml (+100 -0)
📝 client/ui/qml/Pages2/PageSettingsApiInstructions.qml (+0 -1)

...and 3 more files

📄 Description

No description provided


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/1440 **Author:** [@Nethius](https://github.com/Nethius) **Created:** 2/28/2025 **Status:** ✅ Merged **Merged:** 2/28/2025 **Merged by:** [@Nethius](https://github.com/Nethius) **Base:** `dev` ← **Head:** `feature/subscription-settings-page` --- ### 📝 Commits (4) - [`b352a6c`](https://github.com/amnezia-vpn/amnezia-client/commit/b352a6cc49f5d65206dd76530209ccd2dbb90a89) bugfix: fixed shouldBypassProxy() check - [`a336db6`](https://github.com/amnezia-vpn/amnezia-client/commit/a336db66afd878bb47249e8a0bcd47df6990bb61) feature: added page to revoke active devices - [`cf8dad5`](https://github.com/amnezia-vpn/amnezia-client/commit/cf8dad512ae7e783796bb5762267011f8ac1fed5) feature: added a warning that worker has been updated on the backend - [`9c4cba9`](https://github.com/amnezia-vpn/amnezia-client/commit/9c4cba952d2fb70743a17a0bde6e21c2886e8ef1) chore: minor ui fixes ### 📊 Changes **23 files changed** (+461 additions, -76 deletions) <details> <summary>View changed files</summary> 📝 `CMakeLists.txt` (+2 -2) 📝 `client/core/controllers/coreController.cpp` (+5 -1) 📝 `client/core/controllers/coreController.h` (+3 -1) 📝 `client/core/controllers/gatewayController.cpp` (+1 -1) ➕ `client/images/controls/monitor.svg` (+5 -0) 📝 `client/resources.qrc` (+2 -0) 📝 `client/ui/controllers/api/apiConfigsController.cpp` (+39 -1) 📝 `client/ui/controllers/api/apiConfigsController.h` (+1 -0) 📝 `client/ui/controllers/api/apiSettingsController.cpp` (+8 -0) 📝 `client/ui/controllers/api/apiSettingsController.h` (+5 -2) 📝 `client/ui/controllers/pageController.h` (+1 -0) 📝 `client/ui/models/api/apiAccountInfoModel.cpp` (+14 -0) 📝 `client/ui/models/api/apiAccountInfoModel.h` (+2 -1) 📝 `client/ui/models/api/apiCountryModel.cpp` (+4 -0) 📝 `client/ui/models/api/apiCountryModel.h` (+2 -1) ➕ `client/ui/models/api/apiDevicesModel.cpp` (+90 -0) ➕ `client/ui/models/api/apiDevicesModel.h` (+52 -0) 📝 `client/ui/qml/Modules/Style/AmneziaStyle.qml` (+1 -0) ➕ `client/ui/qml/Pages2/PageSettingsApiDevices.qml` (+100 -0) 📝 `client/ui/qml/Pages2/PageSettingsApiInstructions.qml` (+0 -1) _...and 3 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
bsakaguchi 2026-10-13 21:21:12 +00:00
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
amnezia-vpn/amnezia-client#2351
No description provided.