mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 04:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,606 Commits 36 Branches 214 Tags
895614353eeaad03ea55fdba2eab7eefa2eeaa26
Commit Graph

1113 Commits

Author SHA1 Message Date
Sebastian Stenzel
9f7442c1c0 read clientId from vault config 2022-02-23 12:49:39 +01:00
Sebastian Stenzel
64abbc8205 Merge branch 'develop' into feature/hub 
# Conflicts:
#	.github/workflows/release.yml
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
 2022-02-18 09:38:25 +01:00
Sebastian Stenzel
165f190004 read device registration url from vault config 2022-02-18 09:13:33 +01:00
JaniruTEC
12a21bbb71 Added "--version" (short: "-v") 2022-02-17 02:39:48 +01:00
JaniruTEC
1641a06d65 Renamed NO_PARENT_NO_MOUNT_POINT to UNUSED_ROOT_DIR in MountPointRequirement 2022-01-30 01:35:02 +01:00
Sebastian Stenzel
e1a72c41a5 remove unused imports 2022-01-19 20:01:48 +01:00
Sebastian Stenzel
4d4098e0e0 cleanup 2022-01-19 19:49:33 +01:00
Sebastian Stenzel
d52e59d7a4 dedup by setting title when setting the scene 2022-01-19 19:08:54 +01:00
Sebastian Stenzel
9440fb186f Merge branch 'develop' into feature/simplified-workflow-results, 
solving conflict with 5509033

# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java
 2022-01-19 17:35:04 +01:00
Sebastian Stenzel
9856792921 replaced UserInteractionLock with CompletableFuture in LockWorkflow 2022-01-19 17:21:32 +01:00
JaniruTEC
080ddbbb01 Applied changes from code review. 2022-01-18 02:25:25 +01:00
JaniruTEC
b7902ad8fd Merge branch 'develop' into feature/1888-existing-drive-letter-error 2022-01-09 00:35:32 +01:00
Armin Schrenk
550903325d Add vault name in unlock window titles 2022-01-04 16:35:09 +01:00
Sebastian Stenzel
806ffe704c convert Dagger modules to interfaces 2021-12-16 17:09:25 +01:00
Sebastian Stenzel
6ca87d13f5 renamed class 2021-12-16 17:01:56 +01:00
Sebastian Stenzel
983a4d0b0f move masterkey selection to subcomponent 
and use CompletableFuture instead of UserInteractionLock + AtomicReference
 2021-12-16 17:00:49 +01:00
Sebastian Stenzel
d72d9f533c Replace CharBuffer and char[] instances by destroyable Passphrase 2021-12-16 16:41:07 +01:00
Sebastian Stenzel
85a5146d4b wipe pw before losing reference 
[ci skip]
 2021-12-16 13:59:10 +01:00
Sebastian Stenzel
0bece0f591 move passphrase entry to subcomponent 
and use CompletableFuture instead of UserInteractionLock + AtomicReference
 2021-12-16 13:56:59 +01:00
Sebastian Stenzel
abc0f952e0 closing the window will cancel implicitly 2021-12-15 17:32:11 +01:00
Sebastian Stenzel
e6f43d1f05 no need to run code in ui thread 2021-12-15 17:31:08 +01:00
Sebastian Stenzel
25b9722019 Use CompletableFuture instead of UserInteractionLock + AtomicReference 2021-12-15 17:19:59 +01:00
Sebastian Stenzel
157bef5df6 close dialog after successful device registration (to be improved lol) 2021-12-15 17:19:00 +01:00
Sebastian Stenzel
ef281f810f register device via rest api 2021-12-14 17:35:24 +01:00
JaniruTEC
46a3a4fc11 Added error message if user tries to mount to occupied drive. 
Fixes #1888
 2021-12-13 00:46:18 +01:00
Armin Schrenk
921dd8fe67 Add query to redirection to provide more context in the frontend (#1973) 
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
 2021-12-10 13:42:37 +01:00
Sebastian Stenzel
fb580ff79d read masterkey from JWE 2021-12-09 14:03:39 +01:00
Sebastian Stenzel
0110e5bedd added JWE decryption helper 2021-12-09 14:02:39 +01:00
Sebastian Stenzel
0fd6e5bbb0 fixed code smells 2021-12-03 12:17:07 +01:00
Sebastian Stenzel
f277d4d21b fix resource leak 2021-12-03 12:10:40 +01:00
Sebastian Stenzel
2c42a9573e Merge branch 'develop' into feature/displayName 
# Conflicts:
#	pom.xml
 2021-12-02 08:52:40 +01:00
Armin Schrenk
13e9775458 Closes #1918 2021-11-29 17:33:11 +01:00
Sebastian Stenzel
3cd99f680a Merge branch 'develop' into feature/hub 2021-11-24 16:23:10 +01:00
Martin Beyer
63b40091ea rename supporterCert WhiteSpace and VaultNameLength methods 2021-11-18 12:06:50 +01:00
Sebastian Stenzel
21d342d117 Add non-forced retry lock button 2021-11-17 14:03:04 +01:00
Sebastian Stenzel
1b43bf395f apply same error handling to "force lock" as well 2021-11-17 13:45:43 +01:00
Sebastian Stenzel
839175a5e6 Merge branch 'develop' into feature/hub 
# Conflicts:
#	pom.xml
 2021-11-11 16:04:26 +01:00
Armin Schrenk
ce9e1184ec bump cryptofs dependency 2021-11-09 12:39:45 +01:00
Armin Schrenk
c1c5367e2a closes #1891 2021-11-03 11:54:24 +01:00
Sebastian Stenzel
1ca803691b Revert "increase robustness of vault creation:" 
This reverts commit f7fdb87d6d.
 2021-11-03 08:57:35 +01:00
Sebastian Stenzel
5924e443fb Merge branch 'develop' into feature/hub 
# Conflicts:
#	.idea/runConfigurations/Cryptomator_Linux.xml
#	.idea/runConfigurations/Cryptomator_Linux_Dev.xml
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	.idea/runConfigurations/Cryptomator_macOS.xml
#	.idea/runConfigurations/Cryptomator_macOS_Dev.xml
#	pom.xml
 2021-11-02 15:53:23 +01:00
Armin Schrenk
f7fdb87d6d increase robustness of vault creation: 
* clean up after failed vault creation
* ignore if storage readme cannot be created
 2021-11-02 11:50:14 +01:00
Armin Schrenk
c6c2133b34 closes #1863 2021-10-29 17:08:03 +02:00
Sebastian Stenzel
02a59dd538 support loading @2x images 2021-10-29 14:21:04 +02:00
Tobias Hagemann
a4070f551b fixes #1404 2021-10-27 11:56:49 +02:00
Sebastian Stenzel
9b79e9e69e fixed second part of error code (#1741) 2021-10-25 19:34:45 +02:00
Bart
520b3a8f08 Remove IPC socket before creation (#1852) 
(to make sure that socket path can be created)
 2021-10-25 09:47:02 +02:00
Armin Schrenk
e436ce372d Merge branch 'develop' into release/1.6.0 2021-10-08 16:35:19 +02:00
Ralph Plawetzki
445cb7e242 Pass the name of the vault on changing a passphrase 2021-10-06 18:32:15 +02:00
Ralph Plawetzki
54a005a5c9 Pass the name of the vault on storing a passphrase 2021-10-06 18:32:14 +02:00