mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 18:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,969 Commits 36 Branches 214 Tags
c8fa7f1eddb6027cbacb604632bcbd754c13f2e8
Commit Graph

385 Commits

Author SHA1 Message Date
Armin Schrenk
62f279b9f7 Merge branch 'develop' into feature/sanitizer 2021-05-25 11:16:27 +02:00
Armin Schrenk
9562db7e13 Closes 1659 2021-05-25 11:10:03 +02:00
Sebastian Stenzel
64d54133f8 split up check view: 
- checkListController is responsible for selecting and (batch)running checks
- checkDetailController is responsible for displaying results
 2021-05-07 15:51:47 +02:00
Sebastian Stenzel
ac289cc3f7 Merge branch 'develop' into feature/sanitizer 
# Conflicts:
#	main/pom.xml
 2021-05-07 09:20:54 +02:00
Armin Schrenk
c1a249fd7f Merge pull request #1454 from cryptomator/feature/vault-format-8 
Vault Format 8
 2021-05-06 14:05:26 +02:00
Armin Schrenk
c266c7583b bump dependencies (same as in cryptofs) 2021-05-06 13:59:37 +02:00
Armin Schrenk
aa2900fa9e ensure to use cryptolib rc 2021-05-06 12:27:07 +02:00
Sebastian Stenzel
76d1875e01 adjusted to new CryptoFileSystemProvider.checkDirStructureForVault API 2021-05-06 09:56:50 +02:00
Sebastian Stenzel
07efb3e94d Merge branch 'feature/vault-format-8' into feature/sanitizer 
# Conflicts:
#	main/pom.xml
 2021-05-03 12:34:28 +02:00
Armin Schrenk
d710d406d0 Merge branch 'master' into develop 2021-04-23 10:30:12 +02:00
Sebastian Stenzel
69c63702f2 pass a single keyloader to cryptofs 2021-04-23 09:55:08 +02:00
Armin Schrenk
db7e731554 bumping dokany-nio-adapter 2021-04-23 09:48:56 +02:00
Armin Schrenk
e08b43bf17 preparing hotfix 1.5.16 2021-04-23 09:48:40 +02:00
Sebastian Stenzel
58b45bacd1 Merge branch 'develop' into feature/vault-format-8 
[ci skip]
 2021-04-21 13:27:54 +02:00
Sebastian Stenzel
4f942bc23f reset version 
[ci skip]
 2021-04-21 13:27:25 +02:00
Armin Schrenk
86a42234c6 preparing 1.5.15 2021-04-21 12:21:50 +02:00
Sebastian Stenzel
b3ff9423b4 Merge branch 'develop' into feature/vault-format-8 
# Conflicts:
#	main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
#	main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
#	main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
 2021-04-21 11:20:31 +02:00
Armin Schrenk
e3f3090341 bump javafx to version 16 2021-04-21 11:08:42 +02:00
Sebastian Stenzel
c654951dc1 removed ambiguous filenameLengthLimit from settings, added maxCleartextFilenameLength, shortening is now a 100% independent setting stored in the vault rather than the device settings 2021-04-20 18:15:25 +02:00
Armin Schrenk
22a0d3a9a5 bump fuse/dokany-nio versions 2021-04-15 11:11:05 +02:00
Sebastian Stenzel
1fab246fcd ugly PoC for new UI 2021-04-13 15:43:59 +02:00
Sebastian Stenzel
69186b916c adjusted to new async health check api 2021-04-09 16:04:52 +02:00
Armin Schrenk
fb1078b35b bump to SNAPSHOT nio-adapter and refactor Volume.mount() method: 
* returns void
* add onExitAction parameter
* adjust classes
 2021-04-06 10:05:32 +02:00
Sebastian Stenzel
13db1aa9b9 Actually run tests from within Sanitizer UI 2021-04-01 17:40:53 +02:00
Sebastian Stenzel
e6d1e4697c Merge develop into feature/vault-format-8 2021-03-31 11:39:16 +02:00
Armin Schrenk
cf7cbae567 Set dev branch back to SNAPSHOT version 
[ci skip]
 2021-03-31 11:32:06 +02:00
Armin Schrenk
8737eb83f0 Bumping webdav-nio-adapter dependency 2021-03-31 10:58:23 +02:00
Armin Schrenk
2b7cfcd1dc preparing 1.5.14 2021-03-31 09:52:24 +02:00
Armin Schrenk
c05c5e3f90 closes #961 2021-03-30 13:57:21 +02:00
Armin Schrenk
f989b8627c Update java-jwt 2021-03-30 13:10:54 +02:00
Sebastian Stenzel
2cdde54db6 updated mockito due to build errors caused by bytebuddy 2021-03-17 13:14:55 +01:00
Sebastian Stenzel
6941603cdd update to latest cryptolib/cryptofs beta 2021-03-17 13:03:55 +01:00
Sebastian Stenzel
cdca4e047d Merge branch 'develop' into feature/vault-format-8 2021-03-17 12:55:47 +01:00
Sebastian Stenzel
91a2943599 update to JDK 16 2021-03-17 08:16:26 +01:00
Sebastian Stenzel
e32ce22d24 Merge branch 'develop' into feature/vault-format-8 2021-03-10 12:48:58 +01:00
Sebastian Stenzel
0ab28602d1 bumped cryptofs version 2021-03-05 17:33:58 +01:00
Cryptobot
ff687f1bae fix: main/pom.xml to reduce vulnerabilities (#1569) 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-1080611

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
 2021-03-02 08:43:10 +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
3dcdeb1033 refactor pom to store targeted jdk build version in variable 2021-02-24 12:19:12 +01:00
Armin Schrenk
0898158c5a remove bintray as source repository in pom 2021-02-24 12:18:38 +01:00
Armin Schrenk
81091d4bdf bump integrations-* repos and implement new interface methods 2021-02-24 12:18:24 +01:00
Tobias Hagemann
c81f3bd972 updated dependencies 2021-02-23 13:43:07 +01:00
Sebastian Stenzel
1a0bc92bde Merge branch 'develop' into feature/vault-format-8 2021-02-01 12:08:23 +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
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