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
2,786 Commits 36 Branches 214 Tags
cdca4e047d15c0b2224b5f17c2fb397eae6c7543
Commit Graph

355 Commits

Author SHA1 Message Date
Sebastian Stenzel
cdca4e047d Merge branch 'develop' into feature/vault-format-8 2021-03-17 12:55:47 +01:00
Sebastian Stenzel
4e075ab0ca using pattern-matching instanceof where applicable 2021-03-17 09:22:16 +01:00
Sebastian Stenzel
f73ae9759f use new Stream.toList() where applicable 2021-03-17 09:16:44 +01:00
Sebastian Stenzel
f6283b2f7e using text blocks where applicable 2021-03-17 09:12:54 +01:00
Armin Schrenk
e75c415b46 Load vault config on demand and don't cache it 
* fixes issue with unlock after vault migration
 2021-03-10 12:03:46 +01:00
Sebastian Stenzel
62c8edff04 Choose key loading workflow depending on vaultconfig's key ID and allow KeyLoadingComponent to decide itself, what exceptions it can handle 2021-03-03 17:41:17 +01:00
Sebastian Stenzel
7b08c5d287 Merge branch 'develop' into feature/vault-format-8 
# Conflicts:
#	main/pom.xml
#	main/ui/src/main/resources/license/THIRD-PARTY.txt
[ci skip]
 2021-02-26 10:10:50 +01:00
Sebastian Stenzel
84d2644f19 fix wrong versions that have been merged from main branch 2021-02-26 10:05:26 +01:00
Armin Schrenk
d326c7c990 preparing 1.5.13 2021-02-24 16:17:35 +01:00
Armin Schrenk
fed572694f Merge branch 'develop' into feature/win-auto-theme 
# Conflicts:
#	main/pom.xml
 2021-02-24 12:25:04 +01:00
Armin Schrenk
81091d4bdf bump integrations-* repos and implement new interface methods 2021-02-24 12:18:24 +01:00
Martin Beyer
c9b1b1baa5 Fixes #1291 (Windows Automatic Theme) 2021-02-23 17:26:50 +01:00
Sebastian Stenzel
3284578445 Merge branch 'develop' into feature/vault-format-8 
# Conflicts:
#	main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
 2021-01-25 21:42:13 +01:00
Sebastian Stenzel
4b670a59a3 adjusted to new cryptolib/cryptofs API 2021-01-25 21:31:16 +01:00
JaniruTEC
23c113948f Replaced catch with wildcard catch and added additional logger call 
See #1509 for further information and reasoning
 2021-01-25 16:21:35 +01:00
Sebastian Stenzel
3f928cf958 Merge branch 'develop' into feature/vault-format-8 
[ci skip]
 2021-01-22 22:47:54 +01:00
Armin Schrenk
c1f44f76b9 Merge pull request #1512 from cryptomator/feature/refactor-reveal 2021-01-22 11:42:20 +01:00
Sebastian Stenzel
b2f27c0a3d removed dead code 
[ci skip]
 2021-01-22 09:34:18 +01:00
Armin Schrenk
8977440697 Rename RevealerFacade to Revealer 2021-01-21 15:29:04 +01:00
Sebastian Stenzel
81fb6b8794 get rid of RevealException 2021-01-21 15:06:37 +01:00
Armin Schrenk
8867532210 add javadoc 2021-01-21 12:44:11 +01:00
Armin Schrenk
77db435b4f Refactor reveal call stack to apply facade pattern. 2021-01-21 12:41:52 +01:00
Armin Schrenk
7349a29831 Ensure that on windows systems always the gui chooses the mountpoint for webdav 2021-01-19 15:52:52 +01:00
Armin Schrenk
73554b4759 split WebDAV Volume mount method into servlet start and servlet mount 2021-01-19 15:52:20 +01:00
Armin Schrenk
0312f045aa add a logger to WebDAV-Volume 2021-01-19 15:28:50 +01:00
Armin Schrenk
1134c1b2ff closes #1471 
hand the javafx hostservice showDocument() method from ui package to the underlying nio-adapter-libraries through
 2021-01-19 15:27:46 +01:00
Sebastian Stenzel
6e860d293a Merge branch 'develop' into feature/vault-format-8 
[ci skip]
 2021-01-19 15:05:15 +01:00
Armin Schrenk
8bb925fd93 fixes #1509 2021-01-18 18:41:21 +01:00
Armin Schrenk
589b8384eb Only determine filenamelength limit if the the vault is mounted not read-only. 2021-01-11 14:15:37 +01:00
Tobias Hagemann
72f4988632 fixes #1452 2021-01-05 14:14:14 +01:00
Sebastian Stenzel
1eeee61572 Add option to show minimize button despite tray icon being present 
fixes #1179
 2020-12-17 14:50:33 +01:00
Sebastian Stenzel
96bb97d50a Added new setting showTrayIcon defaulting to new environment property cryptomator.showTrayIcon 2020-12-16 13:48:33 +01:00
Sebastian Stenzel
046acb9bbf mark fuse.experimental deprecated 
[ci skip]
 2020-12-16 13:33:50 +01:00
Armin Schrenk
4e89de9e47 activate force locking for dokany 2020-12-14 10:23:27 +01:00
Armin Schrenk
0bf3533f45 Workaround for #1421 2020-12-11 13:25:02 +01:00
Sebastian Stenzel
c0a9a95e4f Adjusted to CryptoFS 2.0.0 2020-12-08 14:39:46 +01:00
Sebastian Stenzel
fbc471635a fixed test 2020-12-08 12:51:34 +01:00
Sebastian Stenzel
3c5b9ed3a6 remove rarely used, complex class 2020-12-08 12:51:11 +01:00
Armin Schrenk
5d00b3dd76 activate ability to abort vault locking if it is mounted with dokany and still busy 
references #1228
 2020-11-19 17:20:08 +01:00
Sebastian Stenzel
02fc9b263a re-added applicable choosers to exception text 2020-11-18 18:12:41 +01:00
Sebastian Stenzel
4c66f81736 simplified line 2020-11-18 18:09:30 +01:00
Sebastian Stenzel
2de151aebe use less generic name 2020-11-18 18:08:00 +01:00
JaniruTEC
422ce4a387 Moved actual choosing of MPCs to MountPointHelper 2020-11-18 16:27:43 +01:00
JaniruTEC
21387bd76c Renamed IrregularUnmountCleaner to MountPointHelper 2020-11-18 16:18:31 +01:00
JaniruTEC
52cd560cb2 Generifyed #chooseMountPoint() 2020-11-18 16:09:09 +01:00
JaniruTEC
6c440dfbbb Re-Added check for non-emtpy dirs 2020-11-18 15:53:33 +01:00
Sebastian Stenzel
a074450452 Merge branch 'master' into develop 2020-11-18 15:03:37 +01:00
Armin Schrenk
17c580267f prevent race conditions 2020-11-18 14:35:16 +01:00
Armin Schrenk
b0ad86f16b Perform cleanup of tmp mount points dir only once. 2020-11-18 14:07:34 +01:00
Sebastian Stenzel
aee4ececba Merge branch 'fix/1409' into hotfix/1.5.10 
fixes #1409
 2020-11-18 13:16:36 +01:00