Commit Graph

5138 Commits

Author SHA1 Message Date
Sebastian Stenzel
21d70b5ae4 moved from coveralls to codecov 2016-08-26 12:52:44 +02:00
Sebastian Stenzel
e90880ac9a speedboost 3000 2016-08-24 17:27:36 +02:00
Sebastian Stenzel
66faa13f40 unlock version 5 vaults 2016-08-23 21:35:13 +02:00
Sebastian Stenzel
8a4a29b4d1 added version 4 to 5 migrator 2016-08-23 21:15:52 +02:00
Sebastian Stenzel
8c8db84a4a refactored migration (using cryptolib) 2016-08-23 21:15:40 +02:00
Sebastian Stenzel
a499a3c80b Merge pull request #324 from oparoz/patch-1
Add that the solution works with Open Source clouds
2016-08-19 19:25:43 +02:00
Olivier Paroz
6a3ccf2b48 Add that the solution works with WebDAV clouds
I think it would be nice to promote other Open Source solutions which use standards such as WebDAV and work well with Cryptomator.
2016-08-19 19:07:39 +02:00
Tobias Hagemann
fcfcffe9cb updated tray icons for OS X [ci skip] 2016-08-19 16:56:04 +02:00
Sebastian Stenzel
363ed4ac4b Accept paths beginning with "~" in cryptomator.settingsPath JVM arg.
[ci skip]
2016-08-17 18:52:08 +02:00
Tobias Hagemann
1f73a08e09 added confirmation checkbox to upgrade screen [ci skip] 2016-08-17 18:11:27 +02:00
Sebastian Stenzel
fe0a34907f Simplified settings/log file path handling. Removed support for %appdata%. Use ~/AppData/Roaming instead! 2016-08-17 15:59:36 +02:00
Sebastian Stenzel
461b11700f added new upgrade log path setting to build script [ci skip] 2016-08-16 19:15:23 +02:00
Sebastian Stenzel
24bfbb59a4 fixes #310 2016-08-16 19:07:05 +02:00
Sebastian Stenzel
4476558e9c fixes #321 2016-08-16 12:33:15 +02:00
Sebastian Stenzel
560171832c Merge branch 'release/1.1.4'
Fixes #308, fixes #319, fixes #318, fixes #317, fixes #311, fixes #267

# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
1.1.4
2016-08-14 15:12:05 +02:00
Sebastian Stenzel
6e93d40e51 changed version to 1.1.4 2016-08-14 15:06:16 +02:00
Sebastian Stenzel
79b819bca6 Merge branch 'release/1.1.4' into develop 2016-08-14 15:04:44 +02:00
Sebastian Stenzel
a18c406cf0 fixed ConflictResolver 2016-08-14 14:56:44 +02:00
Sebastian Stenzel
6730a83cac fixes coverity issue 141842 2016-08-14 14:45:38 +02:00
Sebastian Stenzel
3b3ebd2196 fixes coverity issue 141838 2016-08-14 14:39:05 +02:00
Sebastian Stenzel
505b6542c7 fixes coverity issue 141844 2016-08-14 14:30:48 +02:00
Sebastian Stenzel
31368f0cba fixes coverity issue 141848 2016-08-14 14:28:52 +02:00
Sebastian Stenzel
5b5dd756b1 fixes coverity issue 141858 2016-08-14 14:27:48 +02:00
Sebastian Stenzel
f6ebbb23d1 fixes coverity issue 141860 2016-08-14 14:16:59 +02:00
Sebastian Stenzel
3f0373b08f removed xdg-utils dependencies, using gvfs-open instead of xdg-open. 2016-08-14 13:57:52 +02:00
Sebastian Stenzel
4c3c60060d Graceful unmounting on Windows and improved error handling of deferred closables. 2016-08-14 13:55:51 +02:00
Markus Kreusch
28f275c22d Requests on parent folders of valid vault urls no longer get delayed 2016-08-12 15:11:54 +02:00
Markus Kreusch
24df3c3809 GvfsMounters now use correct protocol. 2016-08-12 14:11:49 +02:00
Markus Kreusch
034a667e07 Fixed problem with sync conflict resolver. Issue #311 2016-08-11 11:19:12 +02:00
Markus Kreusch
008e3e3b05 Continue mounting also if command fails with error code. Issue #267 2016-08-11 09:39:38 +02:00
Markus Kreusch
94a5bf7596 Continue mounting if reg.exe command fails. Issue #267 2016-08-10 13:57:23 +02:00
Markus Kreusch
e8db836eff Workaround for Issue #317 2016-08-10 13:53:04 +02:00
Markus Kreusch
429b26f3d8 Added delay for requests on invalid vault ids. Issue #319 2016-08-10 13:44:26 +02:00
Markus Kreusch
3ae8327300 Added unique id to vaults / webdav urls.
Issue #319, Issue #308
2016-08-10 13:43:46 +02:00
Markus Kreusch
df7e9a0af1 Preventing post requests. Issue #319 2016-08-09 20:02:06 +02:00
Sebastian Stenzel
93d3eca0ab Yet another header to prevent browsers from guessing mime types. Kudos to @LukasReschke 2016-08-09 17:42:24 +02:00
Sebastian Stenzel
7753d1f0e7 If GET request is made by a browser, the file in question is downloaded instead of being executed. Issue #318 2016-08-09 17:35:17 +02:00
Sebastian Stenzel
d7c6c24932 updated tavis config 2016-08-01 10:21:10 +02:00
Sebastian Stenzel
1a75f23081 Merge branch 'feature/mount-method-settings' into develop 2016-08-01 10:17:44 +02:00
Sebastian Stenzel
f071efe1b9 allow user to specify whether to use dav:// or webdav:// scheme for Linux GVFS mounts. Fixes #307 2016-07-25 10:08:21 +02:00
Sebastian Stenzel
a8ad335aed Update README.md
[ci skip]
2016-07-18 12:18:47 +02:00
Markus Kreusch
7022a80c95 Improved error handling
* Created AsyncTaskService to build async UI operations which always log
uncaught exceptions
* Changed all executor service invocations in the UI to invocations of
AsyncTaskService
* Improved error handling in some other places, especially
try-with-resources
* Unlocking read/write locks in NioFile when opening of a channel fails
2016-07-14 13:58:17 +02:00
Sebastian Stenzel
9a2f602d6c fixes #270 2016-07-13 12:37:40 +02:00
Sebastian Stenzel
c78a4aa241 updated travis config [ci skip] 2016-07-11 22:14:35 +02:00
Tobias Hagemann
975ce4d973 Merge branch 'release/1.1.3'
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
1.1.3
2016-07-11 21:16:23 +02:00
Tobias Hagemann
1e6ff0d969 set version to 1.1.3 2016-07-11 21:14:35 +02:00
Sebastian Stenzel
69e133d561 Improved migration from vault version 3 to 4. 2016-07-11 18:07:55 +02:00
Sebastian Stenzel
20e55eddf8 Merge branch 'develop' 1.1.2 2016-07-09 13:25:54 +02:00
Sebastian Stenzel
0fdcdc816a fixed unit test 2016-07-09 13:25:24 +02:00
Sebastian Stenzel
b7506d97a9 Merge branch 'hotfix/1.1.2' 2016-07-09 13:25:03 +02:00