Commit Graph

73 Commits

Author SHA1 Message Date
Sebastian Stenzel
f880db4902 fixes #842 2019-07-10 15:14:23 +02:00
infeo
688726b98d Merge develop into /bugfix/872-vaultLetterChange 2019-07-04 11:22:08 +02:00
Sebastian Stenzel
ed9adab9b4 store custom mount flags in settings.json as string instead of string array 2019-06-18 16:31:10 +02:00
Sebastian Stenzel
06abbf2dd1 custom mount flags default to empty flags 2019-06-18 15:00:54 +02:00
Sebastian Stenzel
f909f384be improved error logging 2019-06-18 15:00:25 +02:00
Sebastian Stenzel
367281fccb overwrite settings atomically 2019-06-18 14:45:43 +02:00
Sebastian Stenzel
f53f2d2ca4 allow to store custom mount flags in the vault settings (required for #802)
[ci skip]
2019-06-17 13:55:31 +02:00
Sebastian Stenzel
29a0336bf4 code quality [ci skip] 2019-03-27 08:50:20 +01:00
Sebastian Stenzel
3e3a4ceefc allow configuration of custom logback configuration via -Dlogback.configurationFile vm arg 2019-02-25 15:54:43 +01:00
Adrian Smith
1048ff5728 Fix DisplayName on testRelativeLogDir 2019-02-24 21:01:04 +00:00
Adrian Smith
6adb591c9a Fix EnvironmentTest.testRelativeLogDir 2019-02-24 20:04:31 +00:00
Sebastian Stenzel
d06720838e Logback configuration is now done programmatically, fixes #832 2019-02-23 03:43:06 +01:00
Sebastian Stenzel
deded33da8 fixed hard-coded path in log config and refinded logging in settingsprovider 2019-02-21 14:52:35 +01:00
Sebastian Stenzel
39f9da16f9 mount path is now configurable via -Dcryptomator.mountPointsDir and no longer hardcoded to ~/.Cryptomator or ~/Library/Application\ Support/Cryptomator
fixes #710
2019-02-21 14:03:52 +01:00
Sebastian Stenzel
b9a120b51b internalized logback config, added -Dcryptomator.logDir=path/relative/to/home. external logback configuration can still be used via -Dlogback.configurationFile=/path/to/logback.xml 2019-02-21 11:39:56 +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
f52b2f323a empty custom mount point checks 2019-02-12 11:01:22 +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
Armin Schrenk
bbe1ef3dbc Feature/custom mount point generalizing (#797)
* changing naming of individual mout path property

* adding input/output for the new custom mount points

* ui integration of custom mount point

* removing unused variable

* Improving UX

* Simplify mountPathProperty and implement its usage

* reverting renaming of Properties concerning the usage of own mount point (rescheduled for 1.5.0)

* changing displayed message when no mount path given

* fixing ui error

* applying suggestion of comment 7338fda418 (r248254180)
2019-01-16 15:08:00 +01:00
Gregvh
7e46957bcb Add read-only option to the advanced settings 2018-10-03 11:30:44 +02:00
infeo
194f373c08 changes spelling of the word dokany 2018-10-01 23:12:51 +02:00
Sebastian Stenzel
aed35c17c8 Added Dokany Support
fixes #207
2018-06-17 13:59:28 +02:00
Markus Kreusch
458866f7d6 Asking user once before enabling update check 2018-05-22 11:36:00 +02:00
Sebastian Stenzel
d53af61b58 Removed "Mount after unlock" option. Mounting/unmounting no longer visible to the user, but merged with unlocking/locking. 2018-05-14 21:37:38 +02:00
Sebastian Stenzel
c7beb4a93c Default to FUSE. Use WebDAV as Backup, if FUSE isn't supported 2018-04-03 17:32:26 +02:00
infeo
13c5e2470b UI improvement: adding checkbox before textbox for entering own mountpath is given 2018-03-30 12:43:50 +02:00
Sebastian Stenzel
7c1a0b5fdf Renamed nioAdapterImpl to volumeImpl. 2018-03-17 16:08:58 +01:00
Sebastian Stenzel
2610ef4645 Using enum instead of string to choose between FUSE and WebDAV 2018-03-17 15:44:27 +01:00
infeo
b165f41c6b fixed test 2018-03-01 23:31:48 +01:00
infeo
41358e6715 fixing issue using an individual mountPath, renaming mountPath-Property, fixing gui issues with mountPath, 2018-03-01 23:27:01 +01:00
infeo
3bc7df9e83 moving the nioAdapterImpl to the commons package 2018-03-01 14:31:49 +01:00
infeo
d0d83c6833 removing defaultMountDir from the settings 2018-02-19 23:14:28 +01:00
infeo
a2f6a85334 extended settingstest to check new setting-attributes 2018-02-03 22:18:28 +01:00
infeo
d170e87c1b integration of the fuseNioAdapter, including all the gui (controller & fxml) and settings wiring. english localization fitted and enriched for fuse 2018-02-03 17:26:59 +01:00
Sebastian Stenzel
096e063754 Dependency cleanup 2017-06-28 11:25:42 +02:00
Sebastian Stenzel
4e5edc834f fixes #526 2017-06-28 11:10:35 +02:00
Sebastian Stenzel
9d2aa62785 Using 127.0.0.1 instead of localhost. References #512 2017-06-27 16:07:55 +02:00
Sebastian Stenzel
d446541f34 added copyright statement 2017-06-21 11:41:34 +02:00
Sebastian Stenzel
0a9fe818dc Updated copyright statement 2017-06-21 11:40:38 +02:00
Sebastian Stenzel
b53da45a15 fixes coverity CID 169315 2017-05-12 16:02:55 +02:00
Sebastian Stenzel
dbc803a0d9 Removed unused classes 2017-05-12 12:06:28 +02:00
Sebastian Stenzel
fdccafaa68 cleanup 2017-05-12 12:03:28 +02:00
Sebastian Stenzel
deebd82ecd updated javadoc [ci skip] 2017-05-11 17:16:36 +02:00
Sebastian Stenzel
0906abdea9 fixes #499 2017-05-11 17:14:23 +02:00
Sebastian Stenzel
d2a2e2304d Implemented #40, tested on macOS 2017-05-04 12:47:15 +02:00
Sebastian Stenzel
8cada6d0a2 Guava convenience functions instead of reinventing the wheel 2017-04-30 00:21:29 +02:00
Sebastian Stenzel
c69fc95126 fixed test 2017-04-26 14:35:26 +02:00