mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-14 08:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,438 Commits 36 Branches 214 Tags
develop
Commit Graph

460 Commits

Author SHA1 Message Date
Sebastian Stenzel
2c42a9573e Merge branch 'develop' into feature/displayName 
# Conflicts:
#	pom.xml
 2021-12-02 08:52:40 +01:00
Sebastian Stenzel
4baf05e684 prepare 1.6.4 2021-12-02 08:46:35 +01:00
Armin Schrenk
b9bbbc1f86 Bump javafx 2021-11-30 17:02:37 +01:00
Armin Schrenk
e9e5df6310 Bump dependencies: 
* cryptofs
* gson
* logback

Closes #1825
 2021-11-29 17:31:27 +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
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
e2ff3f10c1 reset dev branch to SNAPSHOT version 2021-11-02 15:36:09 +01:00
Armin Schrenk
fdbaa5b892 prepare 1.6.2 2021-11-02 12:11:48 +01:00
Sebastian Stenzel
a79e385594 fixes #1866 2021-10-28 08:23:45 +02:00
Sebastian Stenzel
0980e4776b fixes #1843 2021-10-20 12:46:37 +02:00
Sebastian Stenzel
6abe39679e Merge branch 'master' into develop 
[ci skip]
 2021-10-19 15:58:51 +02:00
Armin Schrenk
4801ae3fe3 final dependency bump 2021-10-19 13:31:11 +02:00
Sebastian Stenzel
6ccbc2b806 update cryptofs 2021-10-18 13:44:15 +02:00
Sebastian Stenzel
3492ddbee1 fixes #1833 2021-10-18 13:43:45 +02:00
Snyk bot
0872d84662 bump fuse-nio-adapter to 1.3.3 (#1829) 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGITHUBJNR-1570422
 2021-10-13 12:32:17 +02:00
Sebastian Stenzel
c7c7cdfdce Merge branch 'develop' into feature/displayName 2021-10-08 16:16:18 +02:00
Sebastian Stenzel
6c6f6baf12 Update to JDK 17 (#1828) 
fixes #1404
 2021-10-08 14:59:24 +02:00
Ralph Plawetzki
d4e0b4d07d Change to 1.1.0-beta1 for now, so CI can load the dependency 2021-10-08 12:13:28 +02:00
Ralph Plawetzki
54a005a5c9 Pass the name of the vault on storing a passphrase 2021-10-06 18:32:14 +02:00
Sebastian Stenzel
c1965086f3 update dagger to 2.39 2021-09-30 12:52:04 +02:00
Julian Raufelder
3cc1bef4a6 Bump cryptomator.integrations-linux which fixes #1815 2021-09-29 13:30:29 +02:00
Sebastian Stenzel
cda7cc8ef9 dependency bump 2021-09-27 13:41:02 +02:00
Sebastian Stenzel
18be4ba257 update integrations-api 2021-09-27 13:03:55 +02:00
Sebastian Stenzel
90bceb0f68 Update to OpenJFX 17 (#1809) 
* update to openjfx 17.0.0.1
* use new javafx API instead of AWT
 2021-09-24 21:01:19 +02:00
Armin Schrenk
5670e77908 closes #1783 2021-09-24 11:47:57 +02:00
Armin Schrenk
85a7383c56 bump fuse dependency 2021-09-22 16:21:06 +02:00
Armin Schrenk
526b2a1e72 Bump cryptofs and adjust usages 2021-09-22 16:20:48 +02:00
Armin Schrenk
efc77e4997 updating dependencies 2021-09-17 17:46:28 +02:00
Sebastian Stenzel
fa86d890fe use application-global device key that requires a system keychain 2021-08-20 17:16:07 +02:00
Sebastian Stenzel
1322b872b6 adjusted to new vault config format and unlock status codes 2021-08-13 19:59:31 +02:00
Sebastian Stenzel
33ed41307e Merge branch 'develop' into feature/hub 2021-08-12 17:39:25 +02:00
Sebastian Stenzel
e866b64352 fix build 2021-08-12 17:05:59 +02:00
Sebastian Stenzel
a3a96496b6 use new auth flow 
talking directly to Authorization Server and Resource Server instead of web frontend
 2021-08-12 16:18:22 +02:00
Sebastian Stenzel
43dbdb3e8f prepare local webserver for cross-origin requests 2021-08-09 18:11:44 +02:00
Sebastian Stenzel
7fabc6f52d spawn server listening on localhost, used for oauth redirect_uri 2021-07-29 16:57:28 +02:00
Sebastian Stenzel
2952733a11 add PKCS12 support for on-demand creation and storage of an EC keypair 2021-07-28 17:04:12 +02:00
Sebastian Stenzel
33a6158ed7 fix profile name (so integrations-win is included) 2021-07-23 09:04:47 +02:00
Sebastian Stenzel
065f32fff0 cleanup 2021-07-22 15:14:33 +02:00
Sebastian Stenzel
24188b3892 Merge branch 'develop' into feature/installers 2021-07-20 00:28:08 +02:00
Sebastian Stenzel
d7c70ed841 install non-modular linux keychain libs to libs instead of mods 2021-07-20 00:27:49 +02:00
Sebastian Stenzel
45d9cd601a create buildkit via CI 2021-07-19 21:20:27 +02:00
Sebastian Stenzel
1ab4aa94b3 Merge branch 'develop' into feature/modular 2021-07-19 15:54:02 +02:00
Sebastian Stenzel
397061a6e7 dependency update 2021-07-19 15:52:40 +02:00
Sebastian Stenzel
44cadce23d Merge branch 'develop' into feature/modular 2021-07-15 11:58:44 +02:00
Sebastian Stenzel
b47beabc2f startup time optimization 2021-07-14 17:17:25 +02:00
Sebastian Stenzel
cf7a2db7ec Merge branch 'develop' into feature/modular 2021-07-06 13:19:07 +02:00
Sebastian Stenzel
cadd071ebd update cryptofs 2021-06-28 18:42:10 +02:00
Sebastian Stenzel
429ca6cfd0 Merge branch 'develop' into feature/modular 
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
 2021-06-26 17:48:13 +02:00
Sebastian Stenzel
46691f057e dependency update 2021-06-26 17:42:40 +02:00