Commit Graph

98 Commits

Author SHA1 Message Date
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
Sebastian Stenzel
84d6f11be2 Merge branch 'develop' into feature/fuse-integration
# Conflicts:
#	main/commons/pom.xml
#	main/pom.xml
2018-03-06 11:34:41 +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
Sebastian Stenzel
bfd8918e6a updated pom.xml files 2018-02-26 18:33:51 +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
8a359704ca removed redundant maven dependency 2018-02-03 22:16:03 +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
08cfcffa72 updated CI config 2017-12-30 20:49:25 +01:00
Sebastian Stenzel
6534242275 updated dependencies and CI config 2017-12-30 20:19:27 +01:00
Sebastian Stenzel
4be842aff5 first attempt of building Cryptomator with jdk9 2017-12-20 18:42:16 +01:00
Markus Kreusch
ecdd3bc5ec Fixes #600 2017-11-10 15:04:21 +01:00
armin
17bbd9161f adapted project-files such that project can be used with intellij IDEA IDE 2017-10-24 18:04:19 +02:00
Sebastian Stenzel
f0d364a6c5 formatting [ci skip] 2017-07-01 14:49:49 +02:00
Sebastian Stenzel
5ed50c50c7 Merge branch 'release/1.3.0' into develop 2017-07-01 14:48:23 +02:00
Sebastian Stenzel
8aa5a8d7e8 Preparing 1.3.0 2017-07-01 14:38:46 +02:00
Sebastian Stenzel
6dc597f826 Merge branch 'release/1.3.0-rc8' into develop 2017-06-28 11:39:11 +02:00
Sebastian Stenzel
096e063754 Dependency cleanup 2017-06-28 11:25:42 +02:00
Sebastian Stenzel
5e621eb0fb Preparing 1.3.0-rc8 2017-06-28 11:12:00 +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
d26437ccd5 removed copyright comment from pom.xml 2017-06-21 11:34:40 +02:00
Sebastian Stenzel
e5dff4322a moved dagger-compiler as suggested on github.com/google/dagger 2017-05-26 13:47:43 +02:00
Sebastian Stenzel
b53da45a15 fixes coverity CID 169315 2017-05-12 16:02:55 +02:00
Sebastian Stenzel
f87f10f332 Merge branch 'release/1.3.0-rc5' into develop 2017-05-12 15:47:49 +02:00
Sebastian Stenzel
1370b200bb Preparing 1.3.0-rc5 2017-05-12 15:42:02 +02:00
Sebastian Stenzel
2d55da309b preparing 1.3.0-rc4 2017-05-12 15:32:54 +02:00
Sebastian Stenzel
2e02e70916 Removed codecov, reporting coverage to codacy 2017-05-12 14:48:15 +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