Commit Graph

100 Commits

Author SHA1 Message Date
Sebastian Stenzel
902b29ee0a Merge branch 'develop' into feature/external-keychain
# Conflicts:
#	main/pom.xml
#	main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
2016-08-30 19:22:45 +02:00
Sebastian Stenzel
f39b7b047f Merge branch 'feature/vaultVersion5' into develop 2016-08-30 19:14:28 +02:00
Sebastian Stenzel
72e52df4e0 implemented keychain access on OS X 2016-08-30 19:12:20 +02:00
Sebastian Stenzel
34af306309 defined keychain access interfaces 2016-08-29 17:16:56 +02:00
Sebastian Stenzel
21d70b5ae4 moved from coveralls to codecov 2016-08-26 12:52:44 +02:00
Sebastian Stenzel
8c8db84a4a refactored migration (using cryptolib) 2016-08-23 21:15:40 +02:00
Sebastian Stenzel
45ca7e9e47 migration from vault version 3 to 4 2016-07-03 16:16:23 +02:00
Sebastian Stenzel
e2b94ff6ef updated jacoco dependency 2016-06-08 19:11:56 +02:00
Sebastian Stenzel
847c6813cc started development of 1.2.0 [ci skip] 2016-05-25 15:37:07 +02:00
Sebastian Stenzel
40a1530f19 repeated commit 86000ac 2016-05-10 14:52:30 +02:00
Sebastian Stenzel
0477a0a2e3 Merge branch 'patches-1.0.x'
# Conflicts:
#	main/filesystem-charsets/pom.xml
2016-05-10 14:49:20 +02:00
Sebastian Stenzel
b77d4b5ae2 fixes #264 2016-05-10 14:33:21 +02:00
Sebastian Stenzel
78645ecdf6 fixes #264 2016-05-07 14:40:44 +02:00
Sebastian Stenzel
ad2c9116b9 Release 1.0.4 2016-05-03 16:50:18 +02:00
Sebastian Stenzel
8e24745b3e Merge branch 'master' into patches-1.0.x 2016-05-03 16:46:18 +02:00
Sebastian Stenzel
f16be84aa3 restored bash-based webdav mounting for OS X before 10.10 (issue #211 - to be tested) 2016-05-02 11:11:42 +02:00
Sebastian Stenzel
c02a63878e new method to calculate test coverage (across modules) 2016-04-27 01:14:41 +02:00
Sebastian Stenzel
ac9fe28967 Merge branch 'master' into patches-1.0.x
Release 1.0.3d
2016-04-22 10:55:03 +02:00
Sebastian Stenzel
aa249dabb5 technical release 1.0.3c 2016-04-14 22:28:12 +02:00
Sebastian Stenzel
89c04ad83b test release 1.0.3b 2016-04-10 02:07:52 +02:00
Sebastian Stenzel
f2d383a211 Merge branch 'master' into patches-1.0.x 2016-04-10 01:56:13 +02:00
Sebastian Stenzel
5c0857e98e build ant-kit on tag/release [ci skip] 2016-04-10 01:53:44 +02:00
Sebastian Stenzel
f77ba908da Patch 1.0.3 2016-03-25 16:43:58 +01:00
Sebastian Stenzel
86000ac454 removed test dependencies from main project 2016-03-22 13:04:46 +01:00
Sebastian Stenzel
d026afec35 adjusted snapshot version [ci skip] 2016-03-21 16:49:58 +01:00
Sebastian Stenzel
0d57ebb24a Patch 1.0.2 2016-03-21 16:44:01 +01:00
markus
77aaeabcde Release 1.0.1 2016-03-15 23:30:54 +01:00
Sebastian Stenzel
0133ec8fdf updated HEAD version to 1.1.0-SNAPSHOT [ci skip] 2016-03-09 09:21:08 +01:00
Sebastian Stenzel
d9ba4935b6 restored compatibility with vaults created on the iOS app 2016-03-09 09:01:26 +01:00
Sebastian Stenzel
7122bdf199 changed version to 0.12.0-SNAPSHOT [ci skip] 2016-03-03 20:42:19 +01:00
Sebastian Stenzel
f9b988bf81 Beta 0.11.0 2016-03-03 17:56:17 +01:00
Sebastian Stenzel
94b8726379 - Added settings (references #88)
- Added dependency EasyBind to UI
- Using property bindings instead of listeners in lots of places of the UI now
2016-03-01 20:47:15 +01:00
Markus Kreusch
c93e4e462b Added dagger to filesystem-invariants-tests
* Added dependencies to pom
* Moved dagger version in parent pom to variable
2016-02-20 19:58:30 +01:00
Sebastian Stenzel
f0cb91b22f - separated crypto filesystem and nameshortening filesystem for easier invariant testing
- creation of crypto filesystem only via DI in all integration tests (package-private constructor)
- new Maven module "filesystem-crypto-integration-tests" for tests as well as to provide a ready-to-use Dagger Component for integration tests in other modules.
2016-02-13 14:33:16 +01:00
Sebastian Stenzel
26aa18de77 Restored I/O graph 2016-01-28 21:21:21 +01:00
Sebastian Stenzel
6af4ee08f7 I/O statistics filesystem layer 2016-01-28 20:49:32 +01:00
Sebastian Stenzel
091a44e65d exception handling during mount/unmount/reveal operations 2016-01-27 14:46:48 +01:00
Sebastian Stenzel
c56d0b7d4a first compile-clean attempt to integrate the layered I/O subsystem with the existing UI 2016-01-26 20:17:33 +01:00
Sebastian Stenzel
8d7c3a8f7b renamed module 2016-01-25 14:30:51 +01:00
Markus Kreusch
3f44d9bb66 Added project filesystem-invariants-tests
* Implemented some tests to be run on multiple implementations to
demonstrate how such tests can be implemented
* Detected problems with CryptoFileSystem(NioFileSystem)
* Made CryptoFileSystem and CryptorImpl public / constructible from
other packages
2016-01-06 01:51:46 +01:00
Sebastian Stenzel
a05fa19de4 Merge branch 'separate-installers' into layered-io 2016-01-06 01:03:45 +01:00
Sebastian Stenzel
0b5e09ac60 moved OS-specific installers to separate git repos [ci skip] 2016-01-06 01:03:08 +01:00
Markus Kreusch
64dec64e95 Created NioWebDavServer
* Extracted Server-logic from InMemoryWebDavServer to
FileSystemBasedWebdavServer
* Made InMemoryWebdavServer and NioWebdavvServer use
FileSystemBasedWebdavServer
2015-12-31 17:46:24 +01:00
Markus Kreusch
806e366a72 Added test for Copier
* Created Test covering all lines and mutations
* Added HierachicalContextRunner dependency to allow more structured
tests
2015-12-30 20:53:27 +01:00
Markus Kreusch
62d8cdfe4f Added commons project 2015-12-28 20:58:38 +01:00
Markus Kreusch
1804a52740 Restructured test dependencies
* All modules now have commons-test as test dependency.
* commons-test has dependencies to junit, hamcrest and mockito
2015-12-28 19:30:40 +01:00
Markus Kreusch
157839c32f Changes to filesystem API and nio implementation
* Partial implementation of nio filesystem
* Addded some tests
* Added project for common test dependencies
* Removed default implementation of Folder#delete
** reason: didn't work because empty folders were not deleted and this
cannot be done in the default implementation
2015-12-28 16:32:09 +01:00
Sebastian Stenzel
e67c8f2816 first experiments with jackrabbit-filesystem-adapter 2015-12-24 00:32:07 +01:00
Sebastian Stenzel
b22ac719f2 renamed filesystem layer maven modules 2015-12-18 00:06:31 +01:00
Markus Kreusch
25eed3dc4a Changes to filesystem API and nio implementation
* Partial implementation of nio filesystem
* Removed timeouts from openReadable and openWritable
* Added convenience methods for copying
* Added utility to support deadlock safe opening of multiple files
2015-12-17 23:46:58 +01:00