Commit Graph

1307 Commits

Author SHA1 Message Date
Sebastian Stenzel
debcab47e2 Refactored "file open events" to "app launch events", fixes #55 2019-02-21 00:02:12 +01:00
Sebastian Stenzel
8814372c68 made Settings and DebugMode a Singleton 2019-02-20 23:28:33 +01:00
Sebastian Stenzel
98e5c3ff88 simplified handling of fileOpenRequests 2019-02-20 15:39:00 +01:00
Sebastian Stenzel
f1c332f455 Refactored IPC, fixes #663 2019-02-19 16:46:21 +01:00
Sebastian Stenzel
79306ea498 Introduced new scope @FxApplicationScoped below @Singleton.
This allows us to initialize Dagger before we start the JavaFX application, which will in turn allow us to access Environment from within the IPC classes.

Affects #663
2019-02-19 00:11:58 +01:00
Sebastian Stenzel
d7dda7d249 Preparations for allowing to specify multiple paths to which Cryptomator writes settings, logs, etc. see #710 2019-02-18 16:53:41 +01:00
Sebastian Stenzel
1e80f4bba4 Upgrade to JUnit 5 2019-02-18 15:28:11 +01:00
Sebastian Stenzel
ffd3981f36 Merge branch 'master' into develop
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2019-02-16 11:41:50 +01:00
Sebastian Stenzel
aa23635744 Merge branch 'hotfix/1.4.5' 1.4.5 2019-02-16 11:41:08 +01:00
Sebastian Stenzel
0317e7c21d preparing 1.4.5 2019-02-16 11:40:50 +01:00
Sebastian Stenzel
ec5e8bba30 fixes #826 2019-02-16 11:35:27 +01:00
Sebastian Stenzel
0caa9988d3 add version.txt to buildkit 2019-02-15 19:38:21 +01:00
Sebastian Stenzel
f16c3d5110 updated build config 1.4.5-beta1 2019-02-15 16:00:59 +01:00
Sebastian Stenzel
e1930505d1 updated build config 2019-02-15 15:46:44 +01:00
Sebastian Stenzel
757549919c updated CI config 2019-02-15 15:32:26 +01:00
Sebastian Stenzel
0257802bb0 Merge branch 'openjdk11' into develop 2019-02-15 15:22:00 +01:00
Sebastian Stenzel
5cb4b403cd updated travis-to-bintray upload config 2019-02-15 15:15:26 +01:00
Sebastian Stenzel
8831df9242 Removed creation of fat jar for now. 2019-02-15 14:45:12 +01:00
Sebastian Stenzel
2229a56831 Merge branch 'master' into develop
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2019-02-15 08:45:05 +01:00
Sebastian Stenzel
c3370a8388 Merge branch 'hotfix/1.4.4' 1.4.4 2019-02-15 08:43:57 +01:00
Sebastian Stenzel
1175a114ec bumping version number [ci skip] 2019-02-15 08:41:20 +01:00
Sebastian Stenzel
3374dbf9a5 Fixes #825, fixes #823 2019-02-15 08:39:31 +01:00
Sebastian Stenzel
26aee9e42c create os-dependent buildkit.zip with all java resources required to build a self-contained package 2019-02-14 18:20:11 +01:00
Sebastian Stenzel
ab82874013 Merge branch 'develop' into openjdk11
# Conflicts:
#	main/pom.xml
2019-02-14 18:12:10 +01:00
Sebastian Stenzel
39f1da105e Merge branch 'master' into develop
[ci skip]
2019-02-12 14:19:43 +01:00
Sebastian Stenzel
207bfee6e5 Merge branch 'release/1.4.3' 1.4.3 2019-02-12 14:19:14 +01:00
Sebastian Stenzel
d08f3d03d0 preparing 1.4.3 2019-02-12 14:18:12 +01:00
Sebastian Stenzel
a88bd81347 reverted change from previous commit 2019-02-12 14:13:45 +01:00
Sebastian Stenzel
8e2d2b899e moved ui control logic from initializer to setVault, removed readonly mode from windows 2019-02-12 13:59:38 +01:00
Tobias Hagemann
3b4870a98a Updated localizations 2019-02-12 13:33:19 +01:00
Sebastian Stenzel
ef5eabdb79 Updated SecPasswordField, which will now no longer store passwords in Strings but rather in char[].
Affects #409
2019-02-12 12:02:09 +01:00
Sebastian Stenzel
f52b2f323a empty custom mount point checks 2019-02-12 11:01:22 +01:00
Tobias Hagemann
7e60e5606c Updated custom mount point layout 2019-02-12 01:56:35 +01:00
Sebastian Stenzel
8e2fa082cc improved cleanup after unmounting and support for force-unmounting fuse volumes 2019-02-11 15:55:09 +01:00
Sebastian Stenzel
d8ef402607 Merge branch 'feature/375-readonly' into develop
fixes #375
2019-02-11 15:41:23 +01:00
Sebastian Stenzel
748f1be0c5 fixes #757 2019-02-11 15:40:04 +01:00
Sebastian Stenzel
608d54a8f2 fixes #810 2019-02-11 15:35:00 +01:00
Sebastian Stenzel
50b167e28f improved logging in case of "java.lang.IllegalStateException: Mount failed: Cannot assign a drive letter or mount point. Probably already used by another volume." (#806) 2019-02-11 13:28:38 +01:00
Sebastian Stenzel
b7d06783dd Dokany-specific amendment for #752 2019-02-11 13:21:55 +01:00
Sebastian Stenzel
5ef3d23970 Merge pull request #817 from Gregvh/feature/375-readonly
Unlock vault with readonly flag if requested (fixes #375)
2019-02-08 17:38:13 +01:00
Gregvh
200a195f3b Unlock vault with readonly flag if requested 2019-02-08 15:39:09 +01:00
Sebastian Stenzel
db0aceefdf Merge branch 'develop' into feature/375-readonly
# Conflicts:
#	main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
#	main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
#	main/ui/src/main/resources/fxml/unlock.fxml
2019-02-08 15:28:40 +01:00
Sebastian Stenzel
492e986608 Custom mount point now selected via DirectoryChooser. Fixes #762 2019-02-08 12:32:00 +01:00
Sebastian Stenzel
98cab7e4d8 Delete automatically generated mount point after locking, attempt to fix #773 2019-01-31 15:38:05 +01:00
Sebastian Stenzel
384c9de7aa disabled spell checks [ci skip] 2019-01-31 15:37:20 +01:00
Sebastian Stenzel
528005a623 fixes #752 2019-01-31 15:37:01 +01:00
Tobias Hagemann
c78d4c2d0e Updated localizations, added Catalan 2019-01-27 14:57:03 +01:00
Sebastian Stenzel
c8e9201692 Merge branch 'master' into develop 2019-01-17 13:06:26 +01:00
Sebastian Stenzel
536da2621a Merge branch 'release/1.4.2' 1.4.2 2019-01-17 13:02:58 +01:00
Sebastian Stenzel
6167eeecb4 Preparing 1.4.2 2019-01-17 13:00:36 +01:00