Sebastian Stenzel
2bb87dfa96
Merge branch 'release/1.2.0' into develop
...
# 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/keychain/pom.xml
# main/pom.xml
# main/uber-jar/pom.xml
# main/ui/pom.xml
2016-09-19 15:12:24 +02:00
Sebastian Stenzel
84ac6d88f5
added new localization files to unit test [ci skip]
2016-09-15 23:55:37 +02:00
Sebastian Stenzel
72f6ee6477
updated localizations
2016-09-15 23:52:23 +02:00
Sebastian Stenzel
d7d8d21ba4
Show warning when trying to migrate a masterkey with invalid version mac
2016-09-15 22:15:21 +02:00
Sebastian Stenzel
ef0425e2b1
fixes coverity issue 147409
2016-09-15 14:15:33 +02:00
Sebastian Stenzel
2fa04d7b7c
increased version to 1.3.0-SNAPSHOT
...
[ci skip]
2016-09-15 13:35:22 +02:00
Sebastian Stenzel
a15acd64c8
set version to 1.2.0
2016-09-15 13:33:37 +02:00
Sebastian Stenzel
091e62057d
Injecting CryptorProvider into UpgradeStrategies
2016-09-12 13:56:47 +02:00
Sebastian Stenzel
a63bcfbaa2
relaxed "vault not empty" check
2016-09-04 16:04:16 +02:00
Sebastian Stenzel
c1611a12ed
implemented Windows keychain
2016-09-03 23:04:53 +02:00
Sebastian Stenzel
ce12af8495
Added save password functionality to UI
2016-09-02 15:49:09 +02:00
Sebastian Stenzel
141ffcf656
Merge branch 'feature/native-functions' into feature/external-keychain
2016-08-31 10:41:51 +02:00
Tobias Hagemann
6a15fa132a
app launches as foreground app on mac
2016-08-30 22:41:01 +02:00
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
e0ae50378f
externalized JNI bindings
2016-08-30 17:19:45 +02:00
Markus Kreusch
a9c2b0fc57
fixes #332
2016-08-29 21:08:58 +02:00
Sebastian Stenzel
dc58ba434a
Make Cryptomator a foreground app when restoring from status bar icon
2016-08-29 20:14:48 +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
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
24bfbb59a4
fixes #310
2016-08-16 19:07:05 +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
3ae8327300
Added unique id to vaults / webdav urls.
...
Issue #319 , Issue #308
2016-08-10 13:43:46 +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
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
69e133d561
Improved migration from vault version 3 to 4.
2016-07-11 18:07:55 +02:00
Sebastian Stenzel
1ac87dd32f
fixed NPE [ci skip]
2016-07-08 15:52:00 +02:00
Sebastian Stenzel
392e474cfa
Update tr.txt (POEditor.com)
2016-07-07 14:28:52 +02:00
Sebastian Stenzel
41fb0d51a4
Update es.txt (POEditor.com)
2016-07-07 14:28:51 +02:00
Sebastian Stenzel
aa9fef2967
Update sk.txt (POEditor.com)
2016-07-07 14:28:49 +02:00
Sebastian Stenzel
adc9c02564
Update ru.txt (POEditor.com)
2016-07-07 14:28:48 +02:00
Sebastian Stenzel
ace64117a2
Update kr.txt (POEditor.com)
2016-07-07 14:28:46 +02:00
Sebastian Stenzel
fb4db2506b
Update it.txt (POEditor.com)
2016-07-07 14:28:45 +02:00
Sebastian Stenzel
1076d971ae
Update hu.txt (POEditor.com)
2016-07-07 14:28:43 +02:00
Sebastian Stenzel
eed1b1cff0
Update de.txt (POEditor.com)
2016-07-07 14:28:42 +02:00
Sebastian Stenzel
f5cb82e21e
Update fr.txt (POEditor.com)
2016-07-07 14:28:40 +02:00
Sebastian Stenzel
67661f114b
Update nl.txt (POEditor.com)
2016-07-07 14:28:39 +02:00
Sebastian Stenzel
8a3e09764a
only remove .cryptomator extension for vault version 3
2016-07-07 14:25:55 +02:00
Sebastian Stenzel
eb3cfd6e6a
updated placeholders [ci skip]
2016-07-06 16:25:31 +02:00
Sebastian Stenzel
a51d853d1c
adjusted number format regex [ci skip]
2016-07-06 16:09:14 +02:00
Sebastian Stenzel
d0039466f7
test technical correctness of localization files
2016-07-06 16:07:07 +02:00
Sebastian Stenzel
6283d2df3d
Merge branch 'feature/vault-version-4' into develop
2016-07-03 17:41:46 +02:00
Sebastian Stenzel
a9e0dfdaf8
redesigned upgrade view
2016-07-03 17:38:46 +02:00
