[PR #2666] [CLOSED] feat: defines #2895

New issue

Closed

opened 2026-10-14 21:06:01 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-14 21:06:01 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/2666
Author: @vkamn
Created: 5/28/2026
Status: ❌ Closed

Base: dev ← Head: feat/defines

📝 Commits (6)

2990508 feat: move amnezia hardcode from sources to cmake
8c72dd1 feat: move amnezia hardcode from sources to cmake
7c95458 Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD
6e0efd3 refactor: remove prem v1 migration
3c410a1 chore: move more branding
12a8209 chore: merge with upstream dev

📊 Changes

36 files changed (+418 additions, -278 deletions)

View changed files

📝 CMakeLists.txt (+3 -1)
📝 client/CMakeLists.txt (+39 -13)
📝 client/amneziaApplication.cpp (+5 -4)
➕ client/cmake/clientBrandingDefaults.cmake (+107 -0)
📝 client/cmake/ios.cmake (+14 -14)
📝 client/cmake/macos_ne.cmake (+10 -10)
📝 client/cmake/sources.cmake (+2 -0)
📝 client/core/controllers/api/subscriptionController.cpp (+2 -2)
📝 client/core/controllers/coreController.cpp (+7 -6)
📝 client/core/controllers/coreSignalHandlers.cpp (+2 -2)
📝 client/core/controllers/selfhosted/exportController.cpp (+2 -1)
📝 client/core/controllers/serversController.cpp (+1 -1)
📝 client/core/controllers/settingsController.cpp (+0 -10)
📝 client/core/controllers/settingsController.h (+0 -3)
📝 client/core/repositories/secureAppSettingsRepository.cpp (+0 -10)
📝 client/core/repositories/secureAppSettingsRepository.h (+0 -2)
📝 client/core/utils/api/apiUtils.cpp (+0 -38)
📝 client/core/utils/api/apiUtils.h (+0 -1)
➕ client/core/utils/appUiConfig.h.in (+12 -0)
📝 client/core/utils/errorCodes.h (+0 -1)

...and 16 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/2666 **Author:** [@vkamn](https://github.com/vkamn) **Created:** 5/28/2026 **Status:** ❌ Closed **Base:** `dev` ← **Head:** `feat/defines` --- ### 📝 Commits (6) - [`2990508`](https://github.com/amnezia-vpn/amnezia-client/commit/2990508fcf83efb2abac136a4604f258b93b1415) feat: move amnezia hardcode from sources to cmake - [`8c72dd1`](https://github.com/amnezia-vpn/amnezia-client/commit/8c72dd1072ea7212036bf6c7a57ea587b5ab176a) feat: move amnezia hardcode from sources to cmake - [`7c95458`](https://github.com/amnezia-vpn/amnezia-client/commit/7c95458aae64f155b3c11125a303856574fa312d) Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD - [`6e0efd3`](https://github.com/amnezia-vpn/amnezia-client/commit/6e0efd34763b1e87978e1f85569c41df91409cee) refactor: remove prem v1 migration - [`3c410a1`](https://github.com/amnezia-vpn/amnezia-client/commit/3c410a1c578879cd5790f545cc20722dcd374543) chore: move more branding - [`12a8209`](https://github.com/amnezia-vpn/amnezia-client/commit/12a8209438fce0bbc14383b524e547bb8fdbb906) chore: merge with upstream dev ### 📊 Changes **36 files changed** (+418 additions, -278 deletions) <details> <summary>View changed files</summary> 📝 `CMakeLists.txt` (+3 -1) 📝 `client/CMakeLists.txt` (+39 -13) 📝 `client/amneziaApplication.cpp` (+5 -4) ➕ `client/cmake/clientBrandingDefaults.cmake` (+107 -0) 📝 `client/cmake/ios.cmake` (+14 -14) 📝 `client/cmake/macos_ne.cmake` (+10 -10) 📝 `client/cmake/sources.cmake` (+2 -0) 📝 `client/core/controllers/api/subscriptionController.cpp` (+2 -2) 📝 `client/core/controllers/coreController.cpp` (+7 -6) 📝 `client/core/controllers/coreSignalHandlers.cpp` (+2 -2) 📝 `client/core/controllers/selfhosted/exportController.cpp` (+2 -1) 📝 `client/core/controllers/serversController.cpp` (+1 -1) 📝 `client/core/controllers/settingsController.cpp` (+0 -10) 📝 `client/core/controllers/settingsController.h` (+0 -3) 📝 `client/core/repositories/secureAppSettingsRepository.cpp` (+0 -10) 📝 `client/core/repositories/secureAppSettingsRepository.h` (+0 -2) 📝 `client/core/utils/api/apiUtils.cpp` (+0 -38) 📝 `client/core/utils/api/apiUtils.h` (+0 -1) ➕ `client/core/utils/appUiConfig.h.in` (+12 -0) 📝 `client/core/utils/errorCodes.h` (+0 -1) _...and 16 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-14 21:06:01 +00:00