mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 17:46:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,486 Commits 29 Branches 213 Tags
8c34fc76c59bf610402f4548a2ce8198a1c14bf0
Commit Graph

41 Commits

Author SHA1 Message Date
Armin Schrenk
8c34fc76c5 prevent regressions for google drive preset 2023-05-24 12:07:08 +02:00
Armin Schrenk
c63837c4ce renaming class 2023-05-23 17:01:14 +02:00
Armin Schrenk
179240b325 Readd mac specifc google drive location provider 2023-05-23 09:44:37 +02:00
Armin Schrenk
32a65bddce Add OneDrive Mac location provider 2023-05-22 17:16:03 +02:00
Armin Schrenk
710cdf800d fix compile errors 2023-05-22 15:21:19 +02:00
Armin Schrenk
1d6edb8373 Apply code suggestions 2023-05-22 15:19:15 +02:00
Armin Schrenk
a3d30612ec Add linux paths for Dropbox and OneDrive 2023-05-22 14:51:52 +02:00
Armin Schrenk
28cb812dab add uses field to module info 2023-05-17 18:38:24 +02:00
Armin Schrenk
5b6d09308b Create SPI for cloud location presets 2023-05-16 17:16:42 +02:00
Sebastian Stenzel
40fa961b9b clean up module-info 2022-08-31 11:40:18 +02:00
Sebastian Stenzel
ec7ad0f479 use new ServiceLoader based log configurator 2022-08-11 18:14:54 +02:00
Sebastian Stenzel
5267a04491 make org.cryptomator.desktop an open module 2022-08-11 17:36:10 +02:00
Sebastian Stenzel
46dbe15e4a update dependencies 2022-08-11 17:34:34 +02:00
Sebastian Stenzel
9f0e269baf Merge branch 'develop' into feature/hub 
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
 2022-04-28 12:55:55 +02:00
Sebastian Stenzel
9d4f9c12b9 outsourced authorization flow to https://github.com/coffeelibs/tiny-oauth2-client 2022-04-25 16:28:54 +02:00
Sebastian Stenzel
f3bfe7b64c Merge branch 'develop' into feature/hub 
# Conflicts:
#	.github/workflows/release.yml
#	.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
#	src/main/java/module-info.java
#	src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java
#	src/main/resources/license/THIRD-PARTY.txt
 2022-04-08 20:27:02 +02:00
Sebastian Stenzel
d7da78fc07 adjust to latest API 2022-04-03 15:26:04 +02:00
Sebastian Stenzel
e93e31e745 Merge branch 'develop' into feature/integrations-api-1.1.0 
# Conflicts:
#	pom.xml
#	src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
#	src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
#	src/main/resources/license/THIRD-PARTY.txt
 2022-04-03 12:53:08 +02:00
Sebastian Stenzel
e907360419 refactored launcher, deleted UiLauncherModule 
component graph is now: Main → FxApplicationComponent → Tray, MainWindow, etc
 2022-03-29 20:39:46 +02:00
Sebastian Stenzel
73bbcdcca1 start javafx via Application.launch(...) again 2022-03-28 17:52:39 +02:00
Sebastian Stenzel
a404740ceb Updated to integrations-api 1.1.0-beta2 2022-03-07 17:35:48 +01:00
Sebastian Stenzel
ef281f810f register device via rest api 2021-12-14 17:35:24 +01:00
Sebastian Stenzel
0110e5bedd added JWE decryption helper 2021-12-09 14:02:39 +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
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