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
|
b4539979a4
|
fix module-info
|
2021-09-22 16:43:47 +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
|
43dbdb3e8f
|
prepare local webserver for cross-origin requests
|
2021-08-09 18:11:44 +02:00 |
|
Sebastian Stenzel
|
d938b1c3f7
|
keep window open while waiting for http callback
|
2021-07-30 16:55:05 +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
|
b21ea61342
|
add first draft for hub+http / hub+https keyloading scheme
|
2021-07-28 17:29:44 +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 |
|
Armin Schrenk
|
2aa17edd8c
|
Merge pull request #1712 from cryptomator/feature/improve-health-check
Refactor health check to improve UX
|
2021-07-26 18:33:40 +02:00 |
|
Sebastian Stenzel
|
7efdc41edc
|
removed unused requirement (related to #1589)
|
2021-07-19 22:40:37 +02:00 |
|
Armin Schrenk
|
38c4b3c4a3
|
Merge branch 'develop' into feature/improve-health-check
# Conflicts:
# src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
# src/main/java/org/cryptomator/ui/health/ReportWriter.java
# src/main/resources/fxml/health_check_list.fxml
# src/main/resources/fxml/vault_options.fxml
|
2021-07-19 16:44:43 +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
|
94e26da693
|
Re-enable FUSE
This reverts commit 0e924e7429.
|
2021-06-22 17:16:36 +02:00 |
|
Sebastian Stenzel
|
458a466c7f
|
updated and excluded dependencies
|
2021-06-18 15:17:38 +02:00 |
|
Sebastian Stenzel
|
4f3cd2f47c
|
replace JSR-305 Nullable annotation
|
2021-06-18 15:16:57 +02:00 |
|
Sebastian Stenzel
|
0e924e7429
|
disable fuse for now
|
2021-06-09 21:23:40 +02:00 |
|
Sebastian Stenzel
|
52940d6a19
|
add module-info
[ci skip] due to split package in jnr-fuse
|
2021-06-09 18:37:58 +02:00 |
|