mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-18 02:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,641 Commits 36 Branches 214 Tags
73314ee985b492634cf810bbdda3db8db0c6300a
Commit Graph

131 Commits

Author SHA1 Message Date
Tobias Hagemann
ef07edf8c3 made button-group into an actual button 2019-08-27 16:11:24 +02:00
Sebastian Stenzel
f4ee8d0a15 Added I/O stats (work in progress) 2019-08-27 15:50:15 +02:00
Armin Schrenk
638dac9cb6 adding missing acces location text 2019-08-27 13:48:05 +02:00
Tobias Hagemann
547e5dae52 Merge branch 'feature/jni-mac-tray-icon' into ‘feature/new-ui' 2019-08-26 16:58:28 +02:00
Tobias Hagemann
b4f697e052 updated vault detail layout, disabled focus traversable in main window's title buttons, updated other minor stylings 2019-08-23 17:57:02 +02:00
Tobias Hagemann
5c26c23619 added mac native function for listening to system interface theme changes and changing the tray icon accordingly [ci skip] 2019-08-19 15:55:07 +02:00
Sebastian Stenzel
19840663a8 fixes #948 2019-08-11 22:01:29 +02:00
Sebastian Stenzel
17f45c6dab Implemented some mount options (references #931) 2019-08-07 17:04:56 +02:00
Sebastian Stenzel
7453431bcd Trigger list change events when a vault changes its state, thus removing need for additional state listeners 2019-08-06 13:09:42 +02:00
Sebastian Stenzel
1ec887092f Moved various non-ui related stuff to commons 2019-07-30 14:49:35 +02:00
Sebastian Stenzel
ba34b37f8a Added options to start Cryptomator in background (references #418) 2019-07-29 16:28:29 +02:00
Sebastian Stenzel
74565d7995 fixed unit tests 2019-07-25 15:48:10 +02:00
Sebastian Stenzel
c917fb6a57 Added UI theme switcher (issue #930) 2019-07-22 15:05:23 +02:00
Sebastian Stenzel
f7759d2547 hooked up all controls in Preferences window 2019-07-17 16:17:23 +02:00
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
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
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
Armin Schrenk
86d8599d07 Merge branch 'develop' into openjdk11 2019-01-09 16:07:47 +01:00
Sebastian Stenzel
76c84b34e9 bumped version 2018-11-05 10:46:39 +01:00
Armin Schrenk
54f2667e45 openjdk 11 migration 2018-10-31 15:50:05 +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