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

..

ant-kit

Simplified settings/log file path handling. Removed support for %appdata%. Use ~/AppData/Roaming instead!

2016-08-17 15:59:36 +02:00

commons

externalized JNI bindings

2016-08-30 17:19:45 +02:00

commons-test

started development of 1.2.0 [ci skip]

2016-05-25 15:37:07 +02:00

filesystem-api

speedboost 3000

2016-08-24 17:27:36 +02:00

filesystem-charsets

adjusted test to vault version 4

2016-06-30 22:18:43 +02:00

filesystem-crypto

speedboost 3000

2016-08-24 17:27:36 +02:00

filesystem-crypto-integration-tests

speedboost 3000

2016-08-24 17:27:36 +02:00

filesystem-inmemory

speedboost 3000

2016-08-24 17:27:36 +02:00

filesystem-invariants-tests

started development of 1.2.0 [ci skip]

2016-05-25 15:37:07 +02:00

filesystem-nameshortening

Fixed problem with sync conflict resolver. Issue #311

2016-08-11 11:19:12 +02:00

filesystem-nio

speedboost 3000

2016-08-24 17:27:36 +02:00

filesystem-stats

started development of 1.2.0 [ci skip]

2016-05-25 15:37:07 +02:00

frontend-api

fixes coverity issue 141848

2016-08-14 14:28:52 +02:00

frontend-webdav

Merge branch 'feature/vaultVersion5' into develop

2016-08-30 19:14:28 +02:00

jacoco-report

started development of 1.2.0 [ci skip]

2016-05-25 15:37:07 +02:00

keychain

implemented keychain access on OS X

2016-08-30 19:12:20 +02:00

uber-jar

started development of 1.2.0 [ci skip]

2016-05-25 15:37:07 +02:00

ui

Merge branch 'develop' into feature/external-keychain

2016-08-30 19:22:45 +02:00

pom.xml

Merge branch 'develop' into feature/external-keychain

2016-08-30 19:22:45 +02:00