vladimir.kuznetsov
a2122cb7d7
moved changes from .pro file
2022-12-14 19:55:14 +03:00
vladimir.kuznetsov
d680702b15
change path to cmake folder
2022-12-14 19:17:58 +03:00
vladimir.kuznetsov
d15de499dc
Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into qmake-to-cmake-migration
2022-12-14 19:16:38 +03:00
vladimir.kuznetsov
bd382e3cc7
moved the cmake folder to client root folder
2022-12-14 19:16:12 +03:00
Shahzain Ali
ca9cb997b5
Fixed openVPN issue.
...
Now OpenVPN moved to main target and fixed search path issue, becuase I face below error while archiving. Invalid Bundle. The bundle at 'AmneziaVPN.app/PlugIns/AmneziaVPNNetworkExtension.appex' contains disallowed nested bundles.
2022-12-14 17:28:16 +05:00
Shahzain Ali
ebd920f3b2
Setting target membership on Media.xcassets
2022-12-14 16:56:20 +05:00
pokamest
9c188e0acd
Merge branch 'qt_migration' into qmake-to-cmake-migration
2022-12-13 15:34:38 +01:00
pokamest
1de143362c
Merge branch 'dev' into qt_migration
2022-12-13 15:09:05 +01:00
pokamest
7345f464a5
Merge pull request #138 from amnezia-vpn/feature/android_config_export_import
...
Export/import of configuration files on Android
2022-12-12 16:48:23 +01:00
pokamest
9c5e1faf46
Build fixes
2022-12-12 14:41:54 +01:00
pokamest
1b80c59e65
Merge pull request #137 from amnezia-vpn/bugfix/config-without-containers-import
...
bugfix: import config without containers
2022-12-12 13:30:28 +01:00
Hamza ARBI
f20f528a11
Server selection always in range ( #130 )
...
* Server selection stays always in the list's range
* Removed the usage of QZxing module from PageQrDecoder page
* Fixed null spelling on qml instead of nil
2022-12-12 13:28:03 +01:00
dartsyms
814b66c04a
Various fixes for iOS ( #126 )
...
* Readme update, solution for wireguard make in M1 machines,
* import file and restore enabled.
* xcode_patcher.rb fixed, Now no need to add openVPN framewrok in Embed frameworks manually.
* Now xcode_patcher.rb will add OpenVPN Framework to Embed Frameworks in main target, instead of Network extension.
* Update iosvpnprotocol.swift
* Protocol wasn't detected because it is working on localized description of tunnel, fixed cases.
* Code cleanup
* Speed issue fixed for wireguard.
* GetDeviceIp and bytes(speed of OpenVPN) fixed.
*Device IP method wasn't working as expected, so I replaced. and for speed in OpenVPN we need to handle message seperately for bytes.
*QR progress added with progressbar and text.
2022-12-12 13:16:12 +01:00
vladimir.kuznetsov
4df918d6a5
added qtshadertools to actions and cmake
...
- cleaned up CMakeLists in client project
2022-12-11 10:26:31 +03:00
Shahzain Ali
0fa5dc225c
Reverting shadertools in cmake.
2022-12-11 04:19:24 +05:00
Shahzain Ali
b14f14c45a
Update CMakeLists.txt
2022-12-11 04:09:45 +05:00
Shahzain Ali
0851f4fdd4
Added Qt6ShaderTools in cmake
2022-12-11 04:01:15 +05:00
Shahzain Ali
a0f114e15c
Fixing openvpn
2022-12-11 03:22:59 +05:00
vladimir.kuznetsov
f98792714e
set working directory to call openvpn.sh
2022-12-10 18:46:17 +03:00
vladimir.kuznetsov
4d621dcbfe
set CMAKE_PREFIX_PATH in CMakeLists file
2022-12-09 17:44:57 +03:00
Shahzain Ali
ea2637b1b4
Setting QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON
2022-12-09 04:13:14 +05:00
Shahzain Ali
d784e26913
MacOS issue fixed.
2022-12-09 02:33:46 +05:00
Shahzain Ali
005008814a
icon added in cmake.
2022-12-08 21:34:55 +05:00
Shahzain Ali
ad3bbaedb3
getting openvpn.sh script message.
2022-12-08 18:22:07 +05:00
Dmitriy Karpushin
cad0dabe42
Export/import of configuration filed on Android
2022-12-08 11:51:28 +03:00
Shahzain Ali
48fa3c8aec
Update CMakeLists.txt
2022-12-07 20:36:22 +05:00
Shahzain Ali
fb585cbac0
OpenVPN integrated successfully
2022-12-07 20:35:43 +05:00
Shahzain Ali
dd1adda1a6
postbuild command fix.
2022-12-07 00:19:02 +05:00
Shahzain Ali
3c6cd623af
version issues fixed
2022-12-06 19:18:38 +05:00
Shahzain Ali
70c6e69b36
updatinf info.plist for .vpn type.
2022-12-06 03:09:45 +05:00
Shahzain Ali
943e58d32a
Wireguard working.
2022-12-06 02:47:46 +05:00
Shahzain Ali
5237058016
Added launcher
2022-12-06 02:18:45 +05:00
Shahzain Ali
b87c5f8a51
iOS building successfully
...
Need to remove postbuild commands most probably from osxtools.cmake
2022-12-06 00:42:48 +05:00
Shahzain Ali
43e7a03af4
Some fixes.
...
Now team is preselected in signing.
2022-12-05 20:47:12 +05:00
pokamest
a9217810e7
Remove travis builds and tiny refactoring
2022-12-04 21:54:22 +01:00
vladimir.kuznetsov
0da63062d7
bugfix: fixed transition to the "Installed services" page when importing a config that does not have installed containers
2022-12-03 15:23:52 +03:00
Shahzain Ali
c8dd12eb20
Some more progress in cmake
...
Still have errors, currently not using apple-compile.sh building completely using cmake.
2022-12-02 22:26:10 +05:00
Shahzain Ali
008592f13b
Architecture change not needed for ios build
...
CMAKE_OSX_ARCHITECTURES not needed for ios, it is setting x86_64 for all targets in ios.
2022-12-02 15:07:05 +05:00
vladimir.kuznetsov
56b9972053
build script for macos now uses cmake
2022-12-01 20:26:00 +03:00
vladimir.kuznetsov
1335c94bbc
added include directory for botan ios
2022-12-01 20:24:04 +03:00
vladimir.kuznetsov
21a6ab369e
Merge branch 'qmake-to-cmake-migration' of github.com:amnezia-vpn/desktop-client into qmake-to-cmake-migration
2022-12-01 20:11:56 +03:00
vladimir.kuznetsov
2a80117d42
Merge remote-tracking branch 'remotes/origin/qt6-github-actions' into qmake-to-cmake-migration
2022-12-01 20:05:36 +03:00
Shahzain Ali
e65d312503
Merge branch 'qmake-to-cmake-migration' of https://github.com/amnezia-vpn/desktop-client into qmake-to-cmake-migration
2022-12-01 20:40:00 +05:00
Shahzain Ali
5fc34e643c
Adding network extenstionn, fixing cmake.
...
Botan cmake changes, cmake APPLE/IOS fixes, wireguard added, Currently removed openvpn implementation, once wireguard is stable then will add openVPN framework.
Current progress is it is generating xcode project using
mkdir build-ios
/Users/shahzainali/Qt/6.4.1/ios/bin/qt-cmake . -B build-ios -GXcode
Need to select team only for Network extension only. select AmneizaVPN to run.
current issue is related to Botan.
2022-12-01 20:26:45 +05:00
pokamest
3463a84903
Merge branch 'qt_migration' into qmake-to-cmake-migration
2022-11-30 15:02:55 +01:00
pokamest
48dc532de6
Merge branch 'dev' into qt_migration
2022-11-30 14:26:44 +01:00
Shahzain Ali
20cb62483f
Moved all libraries to LIBS variable
2022-11-30 15:36:25 +05:00
Shahzain Ali
de9167cae6
Frameworks, libcrypto, libssl and some properties added for iOS.
2022-11-29 18:00:59 +05:00
vladimir.kuznetsov
2e5171c205
added matrix for all android arch
2022-11-29 00:55:32 +03:00
Shahzain Ali
a0b5491178
Merge branch 'qt_migration' into qmake-to-cmake-migration
2022-11-28 19:23:28 +05:00