mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 02:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,419 Commits 36 Branches 214 Tags
3ff3b1c63e69c5ecc7752f60ce9a2f94de7ebb6b
Commit Graph

3419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Stenzel
adc9f32fb3 Merge branch 'master' into develop 2021-02-04 12:31:18 +01:00
Sebastian Stenzel
65369bdbff Merge branch 'release/1.5.12' 1.5.12 2021-02-04 12:27:42 +01:00
Sebastian Stenzel
d18e618ef1 preparing 1.5.12 2021-02-04 12:27:02 +01:00
Armin Schrenk
970216dd59 Merge tag '1.5.12' into develop 
1.5.12
 2021-02-04 10:49:52 +01:00
Armin Schrenk
6840a649c7 Merge branch 'release/1.5.12' 2021-02-04 10:49:08 +01:00
Sebastian Stenzel
1a0bc92bde Merge branch 'develop' into feature/vault-format-8 2021-02-01 12:08:23 +01:00
Sebastian Stenzel
e4709ed6fe Refactored FxmlFile and FxmlLoaderFactory 2021-02-01 12:06:38 +01:00
Sebastian Stenzel
21038212c1 remove unused property 
[ci skip]
 2021-02-01 11:54:21 +01:00
Sebastian Stenzel
b15471b4ff add new (optional) "choose masterkey file" step to unlock dialog 2021-01-29 17:44:45 +01:00
Armin Schrenk
19ebc7e562 preparing 1.5.12 1.5.12-beta1 2021-01-27 15:30:56 +01:00
Armin Schrenk
0fa052d2d1 Merge pull request #1518 from cryptomator/fix/1515-suppressed-messages 
Fixed suppressed "invalid mountpoint" messages
 2021-01-27 15:22:47 +01:00
Armin Schrenk
402861b9c0 Update third party licenses 2021-01-27 12:37:50 +01:00
Armin Schrenk
aca1666dea closes #1479 2021-01-27 12:36:22 +01:00
Sebastian Stenzel
ff17b60f56 Refactored UnlockWorkflow using new vault format 8 APIs 2021-01-27 12:09:09 +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
70f6a4877c Make sure not to catch Errors 2021-01-25 21:38:46 +01:00
Sebastian Stenzel
85c5dc8dfb removed tmp workaround 2021-01-25 21:32:33 +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
JaniruTEC
d86ea20c31 Fixed suppressed "invalid mountpoint" messages 
Fixed #1515
 2021-01-23 22:13:07 +01:00
Sebastian Stenzel
3f928cf958 Merge branch 'develop' into feature/vault-format-8 
[ci skip]
 2021-01-22 22:47:54 +01:00
Sebastian Stenzel
01929c2288 New translations strings.properties (Hungarian) 
[ci skip]
 2021-01-22 13:48:57 +01:00
Sebastian Stenzel
2634433b2c New translations strings.properties (Hungarian) 
[ci skip]
 2021-01-22 13:19:41 +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
Sebastian Stenzel
b1d7cfc81b change scope of HostServiceRevealer to @FxApplicationScoped 
because unlock always happens after application start anyway
 2021-01-22 09:31:43 +01:00
Armin Schrenk
7cd5c66836 Refactor reveal() methods: 
* new class HostServiceRevealer implemeting the Volume.Revealer-Interface
* this class is injected in vault service and always used for revealing
* removed Revealer parameter from several reveal methods
 2021-01-21 17:25:23 +01:00
Armin Schrenk
95cef34234 remove unnecessary awtReavealer and trayModule 2021-01-21 16:09:16 +01:00
Armin Schrenk
8977440697 Rename RevealerFacade to Revealer 2021-01-21 15:29:04 +01:00
Armin Schrenk
d5eb84a000 change reveal method in vault service: 
* revealer is no member anymore
* reveal() takes as second argument revealer object
* several other classes hand over a revealer object
* added awt-revealer if application is not yet started
 2021-01-21 15:26:35 +01:00
Sebastian Stenzel
81fb6b8794 get rid of RevealException 2021-01-21 15:06:37 +01:00
Armin Schrenk
92b390d5bb update third-party licenses 2021-01-21 12:44:32 +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
Sebastian Stenzel
cb2bc17283 New translations strings.properties (Hungarian) 
[ci skip]
 2021-01-21 11:06:22 +01:00
Tobias Hagemann
aaa93239d0 Merge pull request #1516 from stacksnack/feature/translations 
New translations strings.properties (Hungarian)
 2021-01-21 11:03:27 +01:00
Sebastian Stenzel
93445e22d4 update library versions 2021-01-21 06:37:41 +01:00
stacksnack
64897cfa21 New translations strings.properties (Hungarian) 
Add hungarian translation
 2021-01-20 21:37:41 +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
efebbc059a keep CTR+HMAC for now (until GCM is supported on all platforms) 2021-01-19 15:09:47 +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
Sebastian Stenzel
ca5d9eba36 New translations strings.properties (Norwegian Bokmal) 
[ci skip]
 2021-01-16 04:07:35 +01:00
Sebastian Stenzel
1a49e24d8a New translations strings.properties (Norwegian Bokmal) 
[ci skip]
 2021-01-16 03:37:26 +01:00
Sebastian Stenzel
24b0ed2502 New translations strings.properties (German) 
[ci skip]
 2021-01-14 18:18:01 +01:00
Sebastian Stenzel
a226d5403a New translations strings.properties (Japanese) 
[ci skip]
 2021-01-14 14:02:17 +01:00
Sebastian Stenzel
0f3085cc73 fixes #1476 2021-01-14 09:56:57 +01:00