Commit graph

554 commits

Author SHA1 Message Date
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
Dmitriy Karpushin
e261a8ba21 Shadowsocks manifest fix 2023-01-17 15:53:54 +03:00
Dmitriy Karpushin
c3c87bff74 Fix of GitHub Actions build 2023-01-17 15:34:37 +03:00
Dmitriy Karpushin
c3f423aad5 Little cleanup 2023-01-17 15:34:37 +03:00
Dmitry Karpushin
21779395ef
Merge branch 'qt_migration' into feature/android_qt6_moving 2023-01-16 14:58:01 +03:00
pokamest
85020270d5 MacOS deploy fix 2023-01-08 17:21:51 -08:00
pokamest
8da30b216f Cleanup 2023-01-08 23:10:46 +00:00
pokamest
167d3caa5d Merge branch 'dev' into qt_migration 2023-01-08 23:00:13 +00:00
pokamest
64526c5232 Various ui fixes 2023-01-08 21:24:06 +00:00
pokamest
d9630afafd Merge branch 'dev' into feature/ovpn-config-import 2023-01-08 19:36:00 +00:00
pokamest
7f561c30b3 Buttons margins 2023-01-08 12:32:07 +00:00
pokamest
1d8f342417 QML refactoring 2023-01-07 13:40:35 +00:00
Dmitriy Karpushin
42038cd6e7 Fixed filenames 2022-12-28 14:26:44 +03:00
Dmitriy Karpushin
a30e478cbd Fix of cmake build 2022-12-27 17:14:44 +03:00
Dmitriy Karpushin
ad4b3dfad1 [WIP] cmake build for android 2022-12-27 15:37:58 +03:00
Dmitriy Karpushin
ad7fc937a9 Added missing files 2022-12-27 11:10:01 +03:00
vladimir.kuznetsov
fd905ef308 added margin for scrollbars for almost all flickable elements 2022-12-26 19:07:05 +03:00
vladimir.kuznetsov
030bb8fe76 Merge branch 'qt_migration' of github.com:amnezia-vpn/desktop-client into qmake-to-cmake-migration 2022-12-26 17:29:52 +03:00
pokamest
131601d9d2
Merge pull request #142 from amnezia-vpn/qt-migration-cleanup
Qt migration cleanup
2022-12-26 14:16:03 +00:00
Dmitriy Karpushin
82165eaf37 1) Fixed theme
2) Fixed VPN connection
2022-12-26 14:00:45 +03:00
pokamest
804a790392 FlickableType added 2022-12-24 16:41:53 +00:00
Dmitriy Karpushin
6c614a4b3c Moving to Qt6:
1) removing of deprecated classes
2) update of IPC mechanism
2022-12-23 17:32:20 +03:00
vladimir.kuznetsov
f9f197afd0 removed unused code 2022-12-18 19:36:19 +03:00
vladimir.kuznetsov
93c43ecbc3 removed unused qzxing folder 2022-12-18 18:27:20 +03:00
vladimir.kuznetsov
1fd1b0388b removed unused code 2022-12-18 18:27:08 +03:00
vladimir.kuznetsov
833364a94e added SortFilterProxyModel submodule 2022-12-18 18:11:41 +03:00
vladimir.kuznetsov
893c105bf2 removed SortFilterProxyModel sources 2022-12-18 18:07:32 +03:00
vladimir.kuznetsov
c6bb33fa84 added display of "pure" config if it was imported in native format
- changed the method of passing the isThirdPartyConfig parameter to page logic
- removed adding hostname to the server name when importing configs in native format
- fixed display of the "$proto settings" button when clicking on the protocol on the "Installed services" page
2022-12-17 21:00:48 +03:00
vladimir.kuznetsov
22939a6707 Merge branch 'dev' of github.com:amnezia-vpn/desktop-client into feature/ovpn-config-import 2022-12-17 17:27:26 +03:00
Hamza ARBI
9222877306 Show Scrollbars whenever the scroll is not obvious 2022-12-17 12:06:19 +01:00
Shahzain Ali
5d8264e854 Update launch.png 2022-12-16 18:48:14 +05:00
pokamest
77124e098c Merge branch 'qt_migration' into qmake-to-cmake-migration 2022-12-16 04:45:43 -08:00
vladimir.kuznetsov
80d792915a fixed clickability of "drawer" elements
- added Qt.PointingHandCursor to SelectContainer drawer
- fixed some warnings
2022-12-15 21:16:59 +03:00
Shahzain Ali
73eb9259e2 Update CMakeLists.txt 2022-12-15 14:26:45 +05:00
vladimir.kuznetsov
14c25480ce changed working directory to call openvpn.sh 2022-12-14 22:26:06 +03:00
vladimir.kuznetsov
77d87f8c50 set working directory to call openvpn.sh 2022-12-14 21:55:51 +03:00
vladimir.kuznetsov
ab389d4817 for osxtools and networkextension/CMakeLists.txt CMAKE_CURRENT_SOURCE_DIR changed to CLIENT_ROOT_DIR 2022-12-14 21:29:33 +03:00
vladimir.kuznetsov
58b9e0cd7c for osxtools and networkextension/CMakeLists.txt CMAKE_CURRENT_LIST_DIR changed to CMAKE_CURRENT_SOURCE_DIR 2022-12-14 21:16:24 +03:00
vladimir.kuznetsov
ed2f5af204 Removed "cd client" for ios, also changed CMAKE_SOURCE_DIR to CMAKE_CURRENT_LIST_DIR.
Removed duplicate deployment files for macos
2022-12-14 20:58:49 +03:00
vladimir.kuznetsov
5b2f1f8969 processing of 3rdparty libraries moved to a separate cmake file 2022-12-14 20:32:13 +03:00
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