mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 09:36:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,134 Commits 29 Branches 213 Tags
ee5a5c65636483d972d767e412b0e2b95d625ac6
Commit Graph

905 Commits

Author SHA1 Message Date
Sebastian Stenzel
ee5a5c6563 Merge pull request #3291 from cryptomator/feature/legacy-device-migration 
Hub 1.2.x → Hub 1.3.x Legacy Device Migration
 2024-02-02 14:59:30 +01:00
Sebastian Stenzel
d66cfe0e7c adjust to new migration API 2024-01-26 16:48:08 +01:00
mindmonk
fa26fa9dee Merge pull request #3289 from cryptomator/feature/share-vault 
Feature: Introduce 'Share Vault' Functionality
 2024-01-26 16:08:06 +01:00
Armin Schrenk
f50b204cef Merge pull request #3288 from cryptomator/feature/3246-split-device-registration 
Feature: Split device registration into "normal" and "legacy" flow
 2024-01-22 14:56:45 +01:00
Sebastian Stenzel
693299a5d7 first draft of legacy device migration 
actual migration still missing due to API discussion
 2024-01-20 13:28:56 +01:00
Sebastian Stenzel
c5bb8a131d dedup 2024-01-20 13:15:33 +01:00
Sebastian Stenzel
2e443c72a9 add new API encryptVaultKey(vaultKey, userKey) 
and `decodeECPublicKey(byte[])`
 2024-01-20 13:12:59 +01:00
Sebastian Stenzel
e9ee17493b refactor API, expose decodeECPrivateKey(byte[]) 2024-01-20 13:01:48 +01:00
Sebastian Stenzel
35eb548d8e replaced Guava's BaseEncoding with Base64 2024-01-20 12:58:44 +01:00
Sebastian Stenzel
dc5d6e734e deduplicate code 2024-01-19 17:55:36 +01:00
Sebastian Stenzel
729f38866f use string templates for URI construction 2024-01-19 17:40:39 +01:00
Jan-Peter Klein
4de8434f1b Merge branch 'develop' into feature/share-vault 2024-01-19 12:31:37 +01:00
Jan-Peter Klein
cd40731b5f implemented open hub feature 
optimized fxml files and img
 2024-01-19 12:30:56 +01:00
Armin Schrenk
062c674ef1 Always hide spinner, as soon as locationPresetLoading is finished 2024-01-19 10:44:06 +01:00
Armin Schrenk
830bb5776f Use naming convention for comparator 2024-01-19 10:04:15 +01:00
Armin Schrenk
bfdb23785e Merge branch 'develop' into feature/3233-locationpresets-background 2024-01-18 15:57:45 +01:00
Armin Schrenk
248d655afb ditch custom in-place sorting and rely on javafx methods 2024-01-18 15:45:45 +01:00
Armin Schrenk
42425afe56 closes #3246 
splitting registerSuccess into two scenes, one for hub 1.3.x and one for legacy
 2024-01-17 16:52:35 +01:00
Sebastian Stenzel
a1b712495f switch back to UI thread later 
see https://github.com/cryptomator/cryptomator/pull/3287#discussion_r1453196792
 2024-01-17 13:35:23 +01:00
Sebastian Stenzel
2225476bf8 reordered methods 
[ci skip]
 2024-01-17 13:33:38 +01:00
Sebastian Stenzel
325057c548 Merge pull request #3287 from cryptomator/feature/refactored-hub-unlock 
Refactored Hub Unlock
 2024-01-17 13:32:09 +01:00
Jan-Peter Klein
4ca190cfb9 implemented a 'Share Vault' button in vault_detail_locked and added a new window for vault sharing options 2024-01-16 17:21:07 +01:00
GiwrgosTsifoutis
828fd321cc Fixed "Locked Vault Options after unlocking vault #3249" (#3267) 
Fixes #3249 

Bound the UIs disabled state to the vault's lock state without the need of a map
 2024-01-16 12:32:36 +01:00
Sebastian Stenzel
87084e8c2a TODO now obsolete 
as we will now re-attempt unlock when returning from device registration

[ci skip]
 2024-01-16 04:14:06 +01:00
Sebastian Stenzel
8e52058373 re-attempt receiving key after registering device 2024-01-16 03:58:30 +01:00
Sebastian Stenzel
b59ce75ecd add step 0: check API level 2024-01-14 15:02:41 +01:00
Sebastian Stenzel
748f895b98 change unlock request order 2024-01-14 15:01:51 +01:00
Sebastian Stenzel
6d974c7fcf fix incorrect vaultId 2024-01-14 14:58:58 +01:00
Sebastian Stenzel
0ed73e8b41 use string templates for building /api/* URIs 2024-01-14 14:02:35 +01:00
Sebastian Stenzel
538b4ecd0b added javadoc 2024-01-14 13:59:23 +01:00
Armin Schrenk
4de25afde0 wrap locations in scrollPane 2024-01-11 23:48:26 +01:00
Armin Schrenk
2e6c228f3f Merge branch 'develop' into feature/3233-locationpresets-background 2024-01-11 22:59:41 +01:00
Sebastian Stenzel
bfb26f6171 renamed field 2024-01-11 11:46:06 +01:00
Sebastian Stenzel
f36e2bb4b7 reduced visibility 2024-01-11 11:45:57 +01:00
Sebastian Stenzel
b85e455ff5 renamed field 2024-01-11 11:42:08 +01:00
Sebastian Stenzel
a902400522 get rid of registerException 
use separate views, no need to pass state between views
 2024-01-11 11:23:54 +01:00
Sebastian Stenzel
a6d6474294 Merge branch 'develop' into feature/3203-device-already-registered 2024-01-11 11:02:45 +01:00
Sebastian Stenzel
06859fe36b remove newline 
[ci skip]
 2024-01-11 10:27:42 +01:00
Sebastian Stenzel
706d2b51be remove added newline 
[ci skip]
 2024-01-11 10:24:28 +01:00
Sebastian Stenzel
c86ee679a9 renamed fuse-specific exception to be more generic 2023-12-21 10:05:22 +01:00
Sebastian Stenzel
a0fcb63a1a replaced FUPFMS 
with more generic set of used mount services
 2023-12-21 09:40:43 +01:00
Jan-Peter Klein
e9c464ba8f sonar cloud issues solved 2023-12-13 15:56:39 +01:00
Jan-Peter Klein
65788f3c1f pr mentioned changes 2023-12-13 15:50:37 +01:00
Jan-Peter Klein
f55fbf0f64 code cleanup and optimized a description text 2023-12-13 09:25:50 +01:00
Jan-Peter Klein
2f8df88ad5 Merge branch 'develop' into feature/vault-volume-type 
# Conflicts:
#	src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
 2023-12-12 12:48:59 +01:00
Jan-Peter Klein
55247d9f8a moved provideDefaultMountService to MountModule and renamed problematicFuseMountServices to CONFLICTING_MOUNT_SERVICES 2023-12-12 12:38:33 +01:00
Jan-Peter Klein
4fc31cb13f refactored 'loopbackPortSupported' from 'BooleanExpression' to 'ObservableValue<Boolean>' in VolumePreferencesController and MountOptionsController 2023-12-11 15:16:41 +01:00
Jan-Peter Klein
1e28a04a7b renamed string properties 2023-12-11 10:16:26 +01:00
Jan-Peter Klein
eef5edf775 code cleanup 2023-12-08 11:14:54 +01:00
Armin Schrenk
dfe4b74f3d clean code: 
* remove unused methods
* combine or move methods
 2023-12-07 17:48:58 +01:00