mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 17:46:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,231 Commits 29 Branches 213 Tags
f2a50b59b5804a368099aa22a9f712ce3e2fafd5
Commit Graph

923 Commits

Author SHA1 Message Date
Armin Schrenk
f2a50b59b5 well, that should be the last reference to dokany 2024-03-12 09:56:30 +01:00
Armin Schrenk
11ba1f3ddc revert 1ab73be1f4 and 2d968eac8c 2024-02-27 12:32:37 +01:00
Jan-Peter Klein
a213f073b1 enhance screen selection by adding primary fallback 2024-02-23 10:51:23 +01:00
Armin Schrenk
1ab73be1f4 fixes #3344 2024-02-22 16:11:54 +01:00
Armin Schrenk
8412871090 apply proper formatting and state to error dialog 2024-02-22 12:23:43 +01:00
Armin Schrenk
664375d692 fix wrong method name 2024-02-20 18:06:55 +01:00
Armin Schrenk
2d968eac8c Merge pull request #3336 from cryptomator/feature/3272-vaultid-as-mountpoint 
Feature: For FUSE-Ts default mountpoint use vault id as mountpoint
 2024-02-20 17:34:09 +01:00
mindmonk
144e929896 Merge pull request #3335 from cryptomator/feature/center-unlock-dialog-on-mainstage 
Center Unlock Success Dialog on Main Application Window
 2024-02-19 15:05:28 +01:00
Armin Schrenk
99c89dbf39 fix possible null comparsion 2024-02-19 10:22:22 +01:00
Jan-Peter Klein
829b64cd3d dialog centers on main app screen if mainWindow is hidden 2024-02-19 08:55:16 +01:00
Jan-Peter Klein
f4007267fb simplified the code and removed the function 2024-02-16 17:31:20 +01:00
Armin Schrenk
c82a0bfaf3 cleanup 2024-02-16 17:09:05 +01:00
Jan-Peter Klein
155ba4607b introduced functionality to center the unlock screen within the main application window 2024-02-16 15:24:52 +01:00
Armin Schrenk
62f6865d3e cleanup created directories after mount 
fails silently
 2024-02-14 10:30:51 +01:00
Armin Schrenk
19a954e677 use correct mountProvider 2024-02-14 10:05:56 +01:00
Armin Schrenk
f262980acc closes #3272 2024-02-13 16:37:46 +01:00
Armin Schrenk
3b3aa18c92 fixes #3233 
this time with gc prevention of a binding
 2024-02-13 00:55:07 +01:00
Armin Schrenk
b01ba27b06 Partially reverting 24293b316f 2024-02-06 14:16:03 +01:00
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