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

353 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
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
Sebastian Stenzel
3f928cf958 Merge branch 'develop' into feature/vault-format-8 
[ci skip]
 2021-01-22 22:47:54 +01:00
Sebastian Stenzel
81fb6b8794 get rid of RevealException 2021-01-21 15:06:37 +01:00
Sebastian Stenzel
93445e22d4 update library versions 2021-01-21 06:37:41 +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
Sebastian Stenzel
f441700c25 Merge branch 'master' into develop 2020-12-15 13:23:21 +01:00
Sebastian Stenzel
241d9781bb bump integrations-win version 2020-12-15 12:41:39 +01:00
Sebastian Stenzel
da31407d63 Preparing 1.5.11 2020-12-15 08:57:35 +01:00
Sebastian Stenzel
4cee27d8dd bump webdav dependencies 2020-12-14 17:30:29 +01:00
Armin Schrenk
b0fce66d77 Add OWASP Dependency-Check Maven Plugin 
* only active if profile dependency check is active
* added suppresion.xml for false positives
* added tmp fix for jwt lib
 2020-12-14 17:02:35 +01:00
Armin Schrenk
bf47ba0145 Merge pull request #1440 from cryptomator/feature/#1439-finish-migration 
closes #1439
 2020-12-14 15:41:52 +01:00
Armin Schrenk
a27c9d63d9 Bump dokany-nio-adapter version 2020-12-14 10:09:13 +01:00
Armin Schrenk
da6aa0f002 bump integrations-win version 2020-12-11 16:23:57 +01:00
Sebastian Stenzel
295cb0ef6d fixes #1446, fixes #1415 2020-12-09 17:17:51 +01:00
Sebastian Stenzel
c0a9a95e4f Adjusted to CryptoFS 2.0.0 2020-12-08 14:39:46 +01:00
Sebastian Stenzel
8479122561 temp fix for vulnerability in upstream lib 
[ci skip]
 2020-12-08 08:30:16 +01:00
Sebastian Stenzel
d24c478faa more dependency updates 2020-11-09 12:01:38 +01:00
Armin Schrenk
bcea1a4b32 Bumping dependencies: 
* javafx to 15
* webdav-nio-server to 1.0.13
 2020-11-09 11:17:52 +01:00
Armin Schrenk
2f8d4568fc Updating CryptoFS Dependency. 
Closes #1293
 2020-11-09 10:33:27 +01:00
Armin Schrenk
5b55318e52 Bumping integrations-linux dependency, removing unused legacy property 
closes #1308
 2020-11-09 10:28:07 +01:00
Armin Schrenk
459f2ea2c3 Updating Dokany-nio-adapter dependency 
References #1228
 2020-11-09 10:27:52 +01:00
Sebastian Stenzel
e9fa1d6476 removed old jni dependency 2020-11-06 14:53:45 +01:00
Sebastian Stenzel
603bf99b25 Replaced MacFunctionsUiState using new integrations api 2020-11-06 14:18:23 +01:00
Sebastian Stenzel
c0e2d01297 Migrated from deprecated MacFunctions to UiAppearanceProvider for UI theme switching 2020-11-05 17:49:39 +01:00
Sebastian Stenzel
6ccd248675 use maven profiles to build different buildkits 2020-11-03 11:21:08 +01:00
Sebastian Stenzel
82a42ea183 Removed keychain module. Implemented new KeychainManager in various UI controller classes 2020-11-02 14:03:39 +01:00
Sebastian Stenzel
51e43a0567 include system integration lib automatically depending on current OS 2020-11-02 13:08:50 +01:00
JaniruTEC
2720a999d1 Updated codestyle (#1388) 
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
 2020-11-02 08:45:41 +01:00
Sebastian Stenzel
7f63153bc1 Update main/pom.xml 2020-10-24 09:47:09 +02:00
snyk-bot
9531d44ab5 fix: main/pom.xml to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
 2020-10-24 01:50:58 +00:00
Armin Schrenk
26160e9bbc Merge pull request #1346 from purejava/fix-isSupported 
Evade DBusException
 2020-10-21 10:56:16 +02:00
JaniruTEC
0206fc0b8f Bumped required version of fuse-nio-adapter to 1.2.5 2020-10-14 15:26:28 +02:00