Commit graph

660 commits

Author SHA1 Message Date
vladimir.kuznetsov
5641db0026 uncommented static link for qtkeychain 2023-03-20 05:45:53 +03:00
vladimir.kuznetsov
2d30f86cc6 removed unused qtssh folder 2023-02-28 06:15:01 +03:00
vladimir.kuznetsov
a287192649 Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support 2023-02-27 19:53:53 +03:00
pokamest
c756ab70ae
Merge pull request #168 from amnezia-vpn/feature/port-availability-on-container-setup
feature/port-availability-on-container-setup
2023-02-27 03:26:57 +00:00
pokamest
2e57fe0dfd
Merge pull request #177 from amnezia-vpn/feature/android_qr_code_scanner
Qr-code scanner for Android
2023-02-27 00:23:33 +00:00
vladimir.kuznetsov
cdbb247780 Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/port-availability-on-container-setup 2023-02-25 18:21:23 +03:00
vladimir.kuznetsov
69d4f0ce10 removed ContainerProps::containerTypeToString 2023-02-25 18:17:25 +03:00
vladimir.kuznetsov
04f61677d7 static link for qtkeychain 2023-02-23 17:28:19 +03:00
Dmitriy Karpushin
b870306c5d Support of multiple-code config 2023-02-22 14:22:03 +03:00
Dmitriy Karpushin
a86e8659f7 CameraActivity with Google ML KIT for decoding QR codes 2023-02-17 16:38:44 +03:00
pokamest
ae10dd639b Merge branch 'dev' into feature/qt6-libssh-support 2023-02-17 01:47:25 +00:00
Shahzain Ali
a0141624b9
Wg fix (#172)
Build fix for iOS
2023-02-15 15:41:18 +00:00
vladimir.kuznetsov
dc137620eb Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/port-availability-on-container-setup 2023-02-14 18:03:19 +03:00
vladimir.kuznetsov
e9b92b216a added a check for port availability when installing up a container
- added wireguard service copying to debug build folder
2023-02-14 18:02:51 +03:00
Dmitriy Karpushin
b68c6b6807 Little refactoring 2023-02-13 10:42:47 +03:00
Dmitriy Karpushin
cdd527f3ac little fix 2023-02-10 13:57:15 +03:00
pokamest
1f048a6d04 Merge branch 'dev' into bugfix/wrong-fields-type-shadowsocks-config 2023-02-09 13:10:26 +00:00
Dmitriy Karpushin
7c4030aaef fix macos build 2023-02-08 19:09:24 +03:00
Dmitriy Karpushin
c1bf0f8799 [WIP] dynamic linking 2023-02-08 16:06:18 +03:00
vladimir.kuznetsov
4b0a4aa5d2 removed unused code 2023-02-08 16:06:18 +03:00
vladimir.kuznetsov
115be88e5d added check for nullptr in sshclient 2023-02-08 16:06:18 +03:00
pokamest
1d9ff17380
Merge pull request #170 from amnezia-vpn/bugfix/cmake-version
bugfix/cmake-version
2023-02-07 17:05:55 +00:00
vladimir.kuznetsov
0fa0d72300 increased required version of cmake for LINUX variable to work properly 2023-02-07 19:45:42 +03:00
vladimir.kuznetsov
16969bc39b added conversion of the local_port and server_port fields from string to number when saving the shadowsocks config 2023-02-06 08:39:56 +03:00
Dmitriy Karpushin
3943314142 Fix of android build 2023-02-03 19:07:09 +03:00
vladimir.kuznetsov
f7ee532add Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/cloak-and-ss-in-linux-bundle 2023-02-02 13:08:23 +03:00
vladimir.kuznetsov
92907bced3 hardcoded tcp for the openvpn-cloak container 2023-02-02 08:09:07 +03:00
Dmitriy Karpushin
ca30b8b62a Correct path for openssl static lib 2023-02-01 17:16:45 +03:00
Dmitriy Karpushin
475de5250e New HEAD of qtkeychain (qt6 support) 2023-01-31 18:02:04 +03:00
Dmitriy Karpushin
7a9860ac29 OpenSSL for android build 2023-01-31 17:12:52 +03:00
pokamest
32ca02bcc7 Crash fix on VPN connection 2023-01-31 01:38:49 +00:00
pokamest
ddefb99e5e Merge branch 'dev' into feature/qt6-libssh-support 2023-01-31 00:53:24 +00:00
pokamest
ca4d6e0b2f Android cmake build fix 2023-01-31 00:47:01 +00:00
pokamest
c3fc3a3132
Merge pull request #163 from amnezia-vpn/feature/confirm-on-clear-and-delete-server
feature/confirm-on-clear-and-delete-server
2023-01-30 20:45:35 +00:00
vladimir.kuznetsov
4c1699935c added binaries for cloak and shadowsocks to Linux bundle 2023-01-30 12:41:51 +03:00
vladimir.kuznetsov
74fbce8b96 Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/qt6-libssh-support 2023-01-29 09:43:03 +03:00
vladimir.kuznetsov
542039df01 Changed notification text for "Forget this server" action 2023-01-29 09:01:48 +03:00
vladimir.kuznetsov
d652ecff21 For the openvpn-cloak container, the choice of the transport protocol in the openvpn settings is blocked 2023-01-29 08:39:31 +03:00
vladimir.kuznetsov
00c4cf300a fixed the width of the buttons in popupWithQuestion 2023-01-27 19:56:39 +03:00
vladimir.kuznetsov
da47054497 changed element type to confirm container deletion from MessageDialog to PopupWithQuestion
- fixed "back" button availability for readonly servers
2023-01-27 18:37:08 +03:00
vladimir.kuznetsov
051a2a3ef2 Added popup to confirm actions "Clear server from Amnesia software" and "Forget this server" 2023-01-27 10:25:14 +03:00
vladimir.kuznetsov
ee609f3e8f fixed warning with QFutureWatcher
- renamed readWireguardConfiguration function to match what it does
2023-01-24 09:43:45 +03:00
pokamest
18d89e9cad
Merge pull request #152 from amnezia-vpn/feature/android_qt6_moving
Moving to Qt 6 and cmake on Android client
2023-01-19 12:51:02 +00:00
Dmitriy Karpushin
39736e865e Merge branch 'feature/android_qt6_moving' into feature/android_bandwidth_counter
# Conflicts:
#	client/platforms/android/android_controller.cpp
#	client/platforms/android/android_controller.h
2023-01-19 14:09:12 +03:00
Dmitriy Karpushin
6bebfb861c Little cleanup 2023-01-18 15:54:19 +03:00
pokamest
9d01a52a4a
Merge pull request #145 from amnezia-vpn/feature/qt6-server-busy-notification
feature/qt6-server-busy-notification
2023-01-18 00:43:13 +00:00
pokamest
a8273a8fdc
Merge pull request #153 from amnezia-vpn/bugfix/some-ui-small-fixes
bugfix/some-ui-small-fixes
2023-01-18 00:41:11 +00:00
vladimir.kuznetsov
b9717e9894 removed unused code 2023-01-17 17:11:45 +03:00
Dmitriy Karpushin
53441148b8 Revert of Gradle upgrade 2023-01-17 16:12:42 +03:00
Dmitriy Karpushin
732d018819 Revert "Shadowsocks manifest fix"
This reverts commit e261a8ba21.
2023-01-17 16:09:06 +03:00