mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-06-09 21:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,498 Commits 30 Branches 215 Tags
develop
Commit Graph

6498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan-Peter Klein bc361ea592 added ui elements for update reminder 2023-07-10 13:04:07 +02:00
Ralph Plawetzki 3d0741f4d2 Use version 1.3.3 of appindicator-gtk3-java 2023-07-09 19:48:52 +02:00
Ralph Plawetzki b75459fbc6 Revert "Find native libraries on the system" 
This reverts commit 58bb266085.
 2023-07-09 19:47:52 +02:00
Jan-Peter Klein 2202c91564 rearranged view 
added pencil icon
optimized code
cleaned up strings.properties
 2023-07-07 16:22:53 +02:00
JaniruTEC e484813233 Added check for deletion of hideaway 2023-07-07 16:19:16 +02:00
Sebastian Stenzel cd10d38990 adjusted to latest API-changes 2023-07-06 18:57:10 +02:00
Jan-Peter Klein f817bc5378 implement requested changes from PR review 2023-07-06 11:03:34 +02:00
JaniruTEC c30c90d2c3 Merge pull request #2985 from cryptomator/feature/2981-differ-options-preferences 
Fix 2981
 2023-07-05 16:27:55 +02:00
Jan-Peter Klein 09b638eafa pr mentioned changes implemented 2023-07-05 16:19:11 +02:00
JaniruTEC 91de0c1813 Added called to #showMainWindow 
See: https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252863161
 2023-07-05 15:50:35 +02:00
JaniruTEC a3c953d437 Refactored decision model 
See: https://github.com/cryptomator/cryptomator/pull/2985#pullrequestreview-1514141146
 2023-07-05 15:49:43 +02:00
JaniruTEC 743da019f9 Cleaned up UnlockInvalidMountPointController 
See:
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252868655
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252874468
 2023-07-05 15:26:19 +02:00
Jan-Peter Klein 2c506fcc97 rearranged view elements an renamed advancedSettings to expertSettings 2023-07-05 13:17:10 +02:00
Jan-Peter Klein dd71df8382 Merge branch 'develop' into feature/custom-shortening-threshold 2023-07-05 11:55:51 +02:00
Sebastian Stenzel 8cb21c97e3 add mark for future improvement 2023-07-04 16:58:37 +02:00
Sebastian Stenzel 0ad8ce77ef handle "invalid setup code" error properly 2023-07-04 16:55:42 +02:00
Sebastian Stenzel e358ffd666 added tests 2023-07-04 16:47:54 +02:00
Armin Schrenk 2c984ad405 use system property path.separator and fix failing unit test on windows 2023-07-04 16:31:28 +02:00
JaniruTEC 171b0e61ad Finished implementation 2023-07-04 16:14:08 +02:00
JaniruTEC e5047c242c Moved subcomponent-bindings 
Moved bindings for VaultOptionsComponent and HealthCheckComponent from MainWindowModule to FxApplicationModule
 2023-07-04 15:35:23 +02:00
Sebastian Stenzel 496f9a9cd5 docs 
[ci skip]
 2023-07-04 15:05:22 +02:00
Sebastian Stenzel 61025de0d6 renamed var 
[ci skip]
 2023-07-04 14:43:56 +02:00
Sebastian Stenzel f08049b960 fix "register device" on legacy hub instances 2023-07-04 14:34:36 +02:00
JaniruTEC 131145e8b8 Merge branch 'develop' into feature/2981-differ-options-preferences 2023-07-04 14:00:44 +02:00
JaniruTEC 11a0136cb9 Fixed run configurations 
See: #2982
 2023-07-04 13:55:42 +02:00
Armin Schrenk e92b80bdf4 fix local win build script to download jfxmods 2023-07-04 12:42:55 +02:00
Armin Schrenk 9d81b2312f fix local build script to parse two digit verison nums correctly 2023-07-04 12:41:58 +02:00
Armin Schrenk 511dbe355a Fixes #2982 2023-07-04 12:41:06 +02:00
JaniruTEC cca6d475b3 Updated UI 2023-07-03 21:14:12 +02:00
JaniruTEC 88c6246ceb Prepared UnlockInvalidMountPointController for new feature 2023-07-03 21:08:49 +02:00
Jan-Peter Klein 7bf2de6339 Merge branch 'develop' into feature/custom-shortening-threshold 2023-07-03 16:22:43 +02:00
Jan-Peter Klein 894d0528df refactoring 2023-07-03 15:34:01 +02:00
Armin Schrenk 168b9ef096 changed default folder mount location on macOS 2023-07-03 13:11:38 +02:00
Sebastian Stenzel 711a3881f8 fix appimage CI build 2023-07-03 11:00:12 +02:00
Sebastian Stenzel 399c5c0565 Merge branch 'develop' into feature/libappindicator 2023-07-03 10:59:50 +02:00
Sebastian Stenzel 6c8005e1b2 use github.ref instead of inputs.ref 
[ci skip]
 2023-07-03 10:59:32 +02:00
Sebastian Stenzel ca6c1e244c use correct integrations API version 2023-07-03 10:40:50 +02:00
Ralph Plawetzki 449e330992 Merge branch cryptomator/develop 2023-07-01 18:45:45 +02:00
Ralph Plawetzki 0f0855165e Changes due to new handling of system environment 
Introduced with PR #2957
 2023-07-01 18:02:12 +02:00
Sebastian Stenzel 746c8f54eb Merge branch 'develop' into feature/new-hub-keyloading 
# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/hub/CreateDeviceDto.java
#	src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
 2023-06-30 16:20:59 +02:00
Sebastian Stenzel ed8457ff36 remove dead test 2023-06-30 13:53:25 +02:00
Sebastian Stenzel a50bc8e05c reduce api surface 2023-06-30 13:53:06 +02:00
Sebastian Stenzel e382a3bab9 make settings' fields public, remove accessor methods 2023-06-30 13:52:15 +02:00
Sebastian Stenzel 9cd50e8ae4 Merge pull request #2974 from cryptomator/feature/replace-gson 
Replace GSON with Jackson
 2023-06-30 13:48:19 +02:00
Sebastian Stenzel 1a6836dac6 remove unnecessary annotation 
[ci skip]
 2023-06-30 12:39:48 +02:00
Armin Schrenk 067814d5db Merge pull request #2957 from cryptomator/feature/preprocess-properties 
Feature: Preprocess JVM properties at app start to adjust to OS environment.

Closes #2838
 2023-06-30 12:38:55 +02:00
Armin Schrenk 29d63a0a83 final clean up 2023-06-30 11:57:09 +02:00
Armin Schrenk 8c3ede0d2a clean up 2023-06-30 11:20:28 +02:00
Armin Schrenk ee82965ef5 adding "integration tests" 2023-06-30 11:20:07 +02:00
Armin Schrenk ab048508a8 change getProperty(key, default) and add unit test 2023-06-30 10:57:36 +02:00