mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 12:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,084 Commits 36 Branches 214 Tags
32e81796aeea9e9eb5ccf379dc6dc2abacda4e7a
Commit Graph

165 Commits

Author SHA1 Message Date
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
Sebastian Stenzel
b3cf7eee16 updated fuse-adapter version 2018-03-06 11:26:53 +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
242b1e92a3 renaming NioAdapter-Interface to Volume to prevent confusing to FUSE-project 2018-03-01 14:35:03 +01:00
infeo
f774829fb1 Pushing FuseEnvironment to other project, using fuseMount now in FuseNioAdapter 2018-02-27 15:38:25 +01:00
Sebastian Stenzel
bfd8918e6a updated pom.xml files 2018-02-26 18:33:51 +01:00
Sebastian Stenzel
3989316269 replaced org.apache.httpcomponents:httpclient by jdk.incubator.httpclient (will become official standard in jdk10) 2018-02-23 18:21:38 +01:00
infeo
d0d83c6833 removing defaultMountDir from the settings 2018-02-19 23:14: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
79fd17250b updated dependency 2018-01-06 08:07:35 +01:00
Sebastian Stenzel
b8ee19b395 fixing use of desktop features on headless platform 2017-12-30 21:05:01 +01:00
Sebastian Stenzel
9e82739c16 fixed dependency version 2017-12-30 20:22:59 +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
Sebastian Stenzel
ad27094d63 Merge branch 'release/1.3.2' into develop 
Fixes #554, fixes #542
 2017-11-25 17:29:39 +01:00
Sebastian Stenzel
b8de68bf3b Preparing 1.3.2 2017-11-25 17:03:24 +01:00
Sebastian Stenzel
8741c64b86 updated dependencies 2017-11-24 20:14:38 +01:00
Sebastian Stenzel
51e6ee5be5 fixes #592 2017-11-20 17:45:05 +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
69d379d03b fixes #583 2017-10-18 12:34:53 +02:00
Sebastian Stenzel
f84bb4710f Updated webdav-nio-adapter to 1.0.0 2017-08-16 21:06:28 +02:00
Sebastian Stenzel
7900f0ea8c fixes #536 2017-07-04 13:03:13 +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
0ce48fab25 mount "cryptomator-vault" instead of 127.0.0.1, if this happens to be an localhost alias (references #529) 2017-06-30 12:55:33 +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
d26437ccd5 removed copyright comment from pom.xml 2017-06-21 11:34:40 +02:00
Sebastian Stenzel
54e9b2e1c1 updated dependency 2017-06-20 14:19:13 +02:00
Sebastian Stenzel
3d030cb6b0 New vault format: Passwords are now strictly used in unicode NFC when passed to key derivation. References #521 2017-06-20 12:08:36 +02:00
Sebastian Stenzel
df9fa9ebad Fixes #507 2017-06-01 23:52:23 +02:00
Sebastian Stenzel
8a6c43ee69 Updated dependencies 2017-05-30 17:58:36 +02:00
Sebastian Stenzel
0fc2b18f68 updated dependencies [ci skip] 2017-05-26 14:50:37 +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
2d68e27d3d moved from log4j to logback 2017-05-16 17:13:03 +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
761207155d updated dependency 2017-05-12 15:28:44 +02:00
Sebastian Stenzel
2e02e70916 Removed codecov, reporting coverage to codacy 2017-05-12 14:48:15 +02:00
Sebastian Stenzel
c046056736 Updated JNI dependency [ci skip] 2017-04-29 00:09:15 +02:00
Markus Kreusch
d48247b7c6 #386: Allow forced locking after failed locking on Windows 2017-04-28 13:23:51 +02:00
Sebastian Stenzel
d0aef5b683 Updated dependencies 2017-04-26 16:24:03 +02:00
Sebastian Stenzel
51cb41975b Updated dependencies (fixing broken directory listing). Loading correct default settings now 2017-04-26 14:30:49 +02:00
Sebastian Stenzel
ee2e07a9a3 Updated dependencies and localization 2017-04-25 14:33:03 +02:00
Sebastian Stenzel
45531dc54a upgraded webdav-nio-adapter to 0.5.0 2017-04-24 15:46:57 +02:00
Sebastian Stenzel
93b2a4e07a Refactored Cryptomator UI. Extracted Launcher to its own Maven module. 2017-04-18 13:40:59 +02:00
Sebastian Stenzel
ada1195a26 Updated dependencies, which fixes #473 2017-04-04 18:00:48 +02:00
Sebastian Stenzel
e1f2330f95 Updated dependencies 2017-03-06 17:08:05 +01:00