[PR #169] [MERGED] feature/container-existence-on-container-setup #1633

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

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/169
Author: @Nethius
Created: 2/6/2023
Status: ✅ Merged
Merged: 2/27/2023
Merged by: @pokamest

Base: dev ← Head: feature/container-existence-on-container-setup


📝 Commits (8)

  • b2fd94d added a check for the existence of the container before installing it
  • b5778a9 if the container already exists, then add it to the list of containers in the client
  • ddc3fe7 Added the advanced settings page
  • 480b218 made error output in the same style
  • 2580475 added a button to scan the server for already installed containers
  • 23a292b Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/container-existence-on-container-setup
  • be39d28 renamed selectedServerIndex for android
  • f2e9631 Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/container-existence-on-container-setup

📊 Changes

30 files changed (+596 additions, -239 deletions)

View changed files

📝 client/core/servercontroller.cpp (+44 -0)
📝 client/core/servercontroller.h (+1 -0)
📝 client/resources.qrc (+2 -0)
📝 client/ui/pages.h (+1 -1)
➕ client/ui/pages_logic/AdvancedServerSettingsLogic.cpp (+88 -0)
➕ client/ui/pages_logic/AdvancedServerSettingsLogic.h (+31 -0)
📝 client/ui/pages_logic/AppSettingsLogic.cpp (+2 -5)
📝 client/ui/pages_logic/GeneralSettingsLogic.cpp (+10 -10)
📝 client/ui/pages_logic/NewServerProtocolsLogic.cpp (+2 -3)
📝 client/ui/pages_logic/ServerConfiguringProgressLogic.cpp (+0 -4)
📝 client/ui/pages_logic/ServerContainersLogic.cpp (+44 -27)
📝 client/ui/pages_logic/ServerListLogic.cpp (+1 -1)
📝 client/ui/pages_logic/ServerSettingsLogic.cpp (+17 -50)
📝 client/ui/pages_logic/ServerSettingsLogic.h (+0 -3)
📝 client/ui/pages_logic/ShareConnectionLogic.cpp (+17 -18)
📝 client/ui/pages_logic/ShareConnectionLogic.h (+0 -1)
📝 client/ui/pages_logic/StartPageLogic.cpp (+1 -1)
📝 client/ui/pages_logic/ViewConfigLogic.cpp (+2 -2)
📝 client/ui/pages_logic/WizardLogic.cpp (+12 -10)
📝 client/ui/pages_logic/WizardLogic.h (+1 -1)

...and 10 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/169 **Author:** [@Nethius](https://github.com/Nethius) **Created:** 2/6/2023 **Status:** ✅ Merged **Merged:** 2/27/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `feature/container-existence-on-container-setup` --- ### 📝 Commits (8) - [`b2fd94d`](https://github.com/amnezia-vpn/amnezia-client/commit/b2fd94d20ef5756d69c879f739ef5654ce98a77b) added a check for the existence of the container before installing it - [`b5778a9`](https://github.com/amnezia-vpn/amnezia-client/commit/b5778a9cb54bf3561c0d85760513f54d7ffb085c) if the container already exists, then add it to the list of containers in the client - [`ddc3fe7`](https://github.com/amnezia-vpn/amnezia-client/commit/ddc3fe7807b0177288d1cf8d8641a5deae93fe2e) Added the advanced settings page - [`480b218`](https://github.com/amnezia-vpn/amnezia-client/commit/480b2181f084427962b68678d9dfa320c4e40ef2) made error output in the same style - [`2580475`](https://github.com/amnezia-vpn/amnezia-client/commit/2580475f6716351f5bbfdad0d306824eb1be2d2a) added a button to scan the server for already installed containers - [`23a292b`](https://github.com/amnezia-vpn/amnezia-client/commit/23a292b8ff4218d487aa87cb503d55424d9d34a1) Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/container-existence-on-container-setup - [`be39d28`](https://github.com/amnezia-vpn/amnezia-client/commit/be39d28be72e265694343a918696b3aa713ba945) renamed selectedServerIndex for android - [`f2e9631`](https://github.com/amnezia-vpn/amnezia-client/commit/f2e9631af4e3b8af702e937ddcb34320a496061f) Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/container-existence-on-container-setup ### 📊 Changes **30 files changed** (+596 additions, -239 deletions) <details> <summary>View changed files</summary> 📝 `client/core/servercontroller.cpp` (+44 -0) 📝 `client/core/servercontroller.h` (+1 -0) 📝 `client/resources.qrc` (+2 -0) 📝 `client/ui/pages.h` (+1 -1) ➕ `client/ui/pages_logic/AdvancedServerSettingsLogic.cpp` (+88 -0) ➕ `client/ui/pages_logic/AdvancedServerSettingsLogic.h` (+31 -0) 📝 `client/ui/pages_logic/AppSettingsLogic.cpp` (+2 -5) 📝 `client/ui/pages_logic/GeneralSettingsLogic.cpp` (+10 -10) 📝 `client/ui/pages_logic/NewServerProtocolsLogic.cpp` (+2 -3) 📝 `client/ui/pages_logic/ServerConfiguringProgressLogic.cpp` (+0 -4) 📝 `client/ui/pages_logic/ServerContainersLogic.cpp` (+44 -27) 📝 `client/ui/pages_logic/ServerListLogic.cpp` (+1 -1) 📝 `client/ui/pages_logic/ServerSettingsLogic.cpp` (+17 -50) 📝 `client/ui/pages_logic/ServerSettingsLogic.h` (+0 -3) 📝 `client/ui/pages_logic/ShareConnectionLogic.cpp` (+17 -18) 📝 `client/ui/pages_logic/ShareConnectionLogic.h` (+0 -1) 📝 `client/ui/pages_logic/StartPageLogic.cpp` (+1 -1) 📝 `client/ui/pages_logic/ViewConfigLogic.cpp` (+2 -2) 📝 `client/ui/pages_logic/WizardLogic.cpp` (+12 -10) 📝 `client/ui/pages_logic/WizardLogic.h` (+1 -1) _...and 10 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 20:46: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#1633
No description provided.