Commit graph

634 commits

Author SHA1 Message Date
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
19fce4975d Merge branch 'dev' into feature/ovpn-config-import 2022-12-04 22:04:51 +01: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
vladimir.kuznetsov
fc8ef8678b Merge remote-tracking branch 'remotes/origin/qt_migration' into qmake-to-cmake-migration 2022-11-28 14:50:20 +03:00
Shahzain Ali
2dc1f2ea5b Setting minimum version to 13
QT 6.4 required minimum ios 13
https://doc.qt.io/qt-6/supported-platforms.html
2022-11-28 15:56:48 +05:00
Shahzain Ali
14be6506ee Qt5 to QT6 fixes. 2022-11-28 15:36:33 +05:00
vladimir.kuznetsov
8b6afcc5ec removed unused qzxing folder 2022-11-27 01:35:13 +03:00
vladimir.kuznetsov
eeed6c3474 chore/revert link to dev qtkeychain submodule 2022-11-27 01:21:40 +03:00
pokamest
80ce8347f6 GH actions 1 2022-11-27 01:21:36 +03:00
vladimir.kuznetsov
3eb7e1392d feature/added cmake support for linux 2022-11-20 21:25:15 +03:00
vladimir.kuznetsov
87fed9fde3 fixed connection with qssh 2022-11-18 16:42:22 +03:00
vladimir.kuznetsov
2564430046 build script now uses cmake, also:
- fixed linking qt6keychain and SortFilterProxyModel
- added translations
2022-11-15 23:31:55 +03:00
vladimir.kuznetsov
663861dc09 for debug target added deploy files required to run the application on Windows, also:
- added deploy additional files for android
- fixed include android libraries
2022-11-15 14:16:36 +03:00
vladimir.kuznetsov
2d6a12101e in CMakeLists source files are common for all platforms, now added via FILE(GLOB) 2022-11-14 22:22:38 +03:00
vladimir.kuznetsov
e40110fa4c added platform specific commands to cmake files 2022-11-12 23:52:15 +03:00
vladimir.kuznetsov
6ac162f3cd added cmake files for client project 2022-11-09 23:54:30 +03:00
vladimir.kuznetsov
7270e701d4 hostname is now added to the server name for imported openvpn and wireguard configs 2022-11-05 19:40:51 +03:00
vladimir.kuznetsov
6941b7463e added display of wireguard configs, such a config will be displayed as raw text 2022-11-04 23:31:39 +03:00
vladimir.kuznetsov
99a6cd82b2 added import of configs in wireguard format 2022-11-03 23:39:58 +03:00
vladimir.kuznetsov
1a44307664 added protocol_defs for new config keywords 2022-11-01 23:24:58 +03:00
vladimir.kuznetsov
53d7a92a0d added import of configs in .ovpn format
- on the "OpenVPN Settings" page, such a config will be displayed as raw text
2022-11-01 23:12:42 +03:00
Hamza ARBI
4ba1f47423 Disable Servers settings item when no server has been set
Fix the logic of *Add Server* to comeback to start page instead of push when no server is set
2022-10-30 22:53:45 +01:00
Hamza ARBI
c38e47b726 Update SvgImageType icon color when the item is disabled 2022-10-30 02:06:51 +01:00
Hamza ARBI
e6a4d79b86 Add settings button on PageStart
Disable some items when no Server has been set
2022-10-30 02:06:20 +01:00
vladimir.kuznetsov
f90ebbbb4e added inclusion of an additional client/server config when generating configs from templates
- fixed name in additional server config field
2022-10-26 14:06:03 +03:00
Hamza ARBI
ab39802512 Using Basic theme in first place 2022-10-24 14:05:28 +01:00
Hamza ARBI
84da67adda Using Basic style in the first place 2022-10-24 13:56:12 +01:00
Hamza ARBI
cfff3c6d97 Used Universal Theme to fix QtQuick Controls 2022-10-24 13:50:41 +01:00
Hamza ARBI
cc3d9e0d2d Fix all QML headers and change the deprecated QML components
* QZXing : Error while integrating it
2022-10-20 20:09:17 +01:00