[PR #154] [MERGED] Release 2.1.2 #1622

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

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/154
Author: @pokamest
Created: 1/18/2023
Status: ✅ Merged
Merged: 1/18/2023
Merged by: @pokamest

Base: master ← Head: dev


📝 Commits (10+)

  • a56fbeb Fix android build script
  • f6d329a Fix Android job CI
  • cdb1a4c Fix for AVP-01-006 - inscure app config permissions
  • 5cbe760 updated gitignore
  • 279f866 completed build linux script
  • 4769a67 Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into Linux_deploy_script
  • 3cb14ad Tiny Linux build scripts fixes
  • 1e71771 Merge pull request #109 from amnezia-vpn/Linux_deploy_script
  • bd7a9e5 Merge pull request #106 from karolsteve/dev
  • 448c01c Travis build fix

📊 Changes

109 files changed (+3769 additions, -1865 deletions)

View changed files

➕ .github/workflows/deploy.yml (+255 -0)
📝 .gitignore (+7 -0)
➖ .gitlab-ci.yml (+0 -27)
📝 .gitmodules (+0 -3)
➖ .travis.yml (+0 -335)
📝 README.md (+6 -1)
➖ client/3rd/ShadowSocks/ss_ios.xcconfig (+0 -23)
➕ client/3rd/qrcodegen/qrcodegen.cpp (+856 -0)
➕ client/3rd/qrcodegen/qrcodegen.hpp (+551 -0)
➕ client/3rd/qrcodegen/qrcodegen.pri (+5 -0)
➖ client/3rd/qzxing (+0 -1)
📝 client/amnezia_application.cpp (+19 -4)
📝 client/android/AndroidManifest.xml (+91 -5)
➕ client/android/res/xml/fileprovider.xml (+4 -0)
➕ client/android/src/org/amnezia/vpn/AuthHelper.java (+24 -0)
➕ client/android/src/org/amnezia/vpn/IPCContract.kt (+5 -0)
📝 client/android/src/org/amnezia/vpn/VPNService.kt (+75 -0)
📝 client/android/src/org/amnezia/vpn/VPNServiceBinder.kt (+133 -84)
➖ client/android/src/org/amnezia/vpn/qt/VPNActivity.java (+0 -37)
➕ client/android/src/org/amnezia/vpn/qt/VPNActivity.kt (+196 -0)

...and 80 more files

📄 Description

Release 2.1.2


🔄 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/154 **Author:** [@pokamest](https://github.com/pokamest) **Created:** 1/18/2023 **Status:** ✅ Merged **Merged:** 1/18/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `master` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`a56fbeb`](https://github.com/amnezia-vpn/amnezia-client/commit/a56fbeb6117a0eaa0226c241a94e14005c6288a2) Fix android build script - [`f6d329a`](https://github.com/amnezia-vpn/amnezia-client/commit/f6d329ac48ac3db6504eeab0c60ced6084cce240) Fix Android job CI - [`cdb1a4c`](https://github.com/amnezia-vpn/amnezia-client/commit/cdb1a4c288e86c5cef31ce08f326ad1435dfd201) Fix for AVP-01-006 - inscure app config permissions - [`5cbe760`](https://github.com/amnezia-vpn/amnezia-client/commit/5cbe7600a66cbe621f57e4ba779a2a19c6c62c3b) updated gitignore - [`279f866`](https://github.com/amnezia-vpn/amnezia-client/commit/279f866bf569c461e549f67b94ccbfd1f55eba9f) completed build linux script - [`4769a67`](https://github.com/amnezia-vpn/amnezia-client/commit/4769a67936a1319dc27bb2791a90e8bbd1f2d707) Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into Linux_deploy_script - [`3cb14ad`](https://github.com/amnezia-vpn/amnezia-client/commit/3cb14ad3bcc57921143cfb4dcd2ebac530e48dad) Tiny Linux build scripts fixes - [`1e71771`](https://github.com/amnezia-vpn/amnezia-client/commit/1e717710b67b8d1e9890223df3c2c372ece7ce44) Merge pull request #109 from amnezia-vpn/Linux_deploy_script - [`bd7a9e5`](https://github.com/amnezia-vpn/amnezia-client/commit/bd7a9e5444e310d6c475cd40830746ca58a92808) Merge pull request #106 from karolsteve/dev - [`448c01c`](https://github.com/amnezia-vpn/amnezia-client/commit/448c01ca99e26f3512c4dec4a911d0cd6abbc755) Travis build fix ### 📊 Changes **109 files changed** (+3769 additions, -1865 deletions) <details> <summary>View changed files</summary> ➕ `.github/workflows/deploy.yml` (+255 -0) 📝 `.gitignore` (+7 -0) ➖ `.gitlab-ci.yml` (+0 -27) 📝 `.gitmodules` (+0 -3) ➖ `.travis.yml` (+0 -335) 📝 `README.md` (+6 -1) ➖ `client/3rd/ShadowSocks/ss_ios.xcconfig` (+0 -23) ➕ `client/3rd/qrcodegen/qrcodegen.cpp` (+856 -0) ➕ `client/3rd/qrcodegen/qrcodegen.hpp` (+551 -0) ➕ `client/3rd/qrcodegen/qrcodegen.pri` (+5 -0) ➖ `client/3rd/qzxing` (+0 -1) 📝 `client/amnezia_application.cpp` (+19 -4) 📝 `client/android/AndroidManifest.xml` (+91 -5) ➕ `client/android/res/xml/fileprovider.xml` (+4 -0) ➕ `client/android/src/org/amnezia/vpn/AuthHelper.java` (+24 -0) ➕ `client/android/src/org/amnezia/vpn/IPCContract.kt` (+5 -0) 📝 `client/android/src/org/amnezia/vpn/VPNService.kt` (+75 -0) 📝 `client/android/src/org/amnezia/vpn/VPNServiceBinder.kt` (+133 -84) ➖ `client/android/src/org/amnezia/vpn/qt/VPNActivity.java` (+0 -37) ➕ `client/android/src/org/amnezia/vpn/qt/VPNActivity.kt` (+196 -0) _...and 80 more files_ </details> ### 📄 Description Release 2.1.2 --- <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:04 +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#1622
No description provided.