Sebastian Stenzel
28cb2e1301
Merge branch 'develop' into feature/cryptofs
...
# Conflicts:
# main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java
# main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
# main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/FilesystemResourceFactory.java
# main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/WebDavServerTest.java
2017-02-24 16:51:42 +01:00
Sebastian Stenzel
277999112e
Updated dependencies
2017-02-24 16:48:15 +01:00
Jordan Tucker
54ae332364
Fix typo in Scrypt Javadoc: costParam -> blockSize
...
> Cost parameter `N`, larger than 1, a power of 2 and
> less than `2^(128 * costParam / 8)`
didn't make any sense. It was meant to be
> Cost parameter `N`, larger than 1, a power of 2 and
> less than `2^(128 * blockSize / 8)`
2017-02-13 22:28:07 -08:00
Sebastian Stenzel
f391a6521d
automatically save settings when chaning vault properties. fixes #446
2017-02-02 11:31:00 +01:00
Sebastian Stenzel
02ae2e7ca0
Vastly refactored settings, integrated new webdav-nio-adapter snapshot version, allow reconfiguration of IPv6 and Port settings during runtime
2017-01-31 22:30:44 +01:00
Tobias Hagemann
b41636a208
added japanese localization, updated other localizations
2017-01-26 16:01:49 +01:00
Tobias Hagemann
0902de821a
fixed unit test
2017-01-25 17:32:50 +01:00
Tobias Hagemann
8a6265658e
fixed range requests
2017-01-25 15:48:21 +01:00
Sebastian Stenzel
7750a49e65
specifying masterkey filename as introduced in cryptofs 1.1.0
2017-01-20 14:01:39 +01:00
Sebastian Stenzel
b75b9781c1
implemented “change password” etc
2017-01-02 17:29:43 +01:00
Sebastian Stenzel
2687c02e31
now passing unchecked CryptoExceptions up through various closures, thus being able to catch “InvalidPassphraseException” in UI
2016-12-21 17:29:54 +01:00
Sebastian Stenzel
71b65e03d6
implemented unlock/reveal/lock
2016-12-20 20:26:17 +01:00
Sebastian Stenzel
e09ee27219
connected filesystem stats
2016-12-20 10:45:40 +01:00
Sebastian Stenzel
5a3428d9b0
cleanup
2016-12-19 17:21:33 +01:00
Sebastian Stenzel
ed109977f8
removed mac warning window fxml
2016-12-19 13:57:59 +01:00
Sebastian Stenzel
d6c6f177e8
code simplification
2016-12-19 13:57:30 +01:00
Sebastian Stenzel
97f2cee1ae
mount name now included in servlet path
2016-12-19 13:57:14 +01:00
Sebastian Stenzel
4fb8a27a78
removed MAC warning screen
2016-12-19 13:55:39 +01:00
Sebastian Stenzel
79b825aaad
call me THE DESTROYER!!!
...
first compile-clean but totally fubar version
2016-12-16 17:20:56 +01:00
Sebastian Stenzel
28fedafb59
added linux-launcher-* to RPM [ci skip]
2016-12-12 11:39:23 +01:00
Tobias Hagemann
d9bff68555
updated localization stuff
...
- added title text to upgrade strategy
- added texts for upgrade 4 to 5
- changed most texts to title style capitalization
2016-11-30 17:22:29 +01:00
Tobias Hagemann
2b84593bde
updated localization
2016-11-29 22:16:46 +01:00
Markus Kreusch
4e728fd387
Merge branch 'feature/issue-363' into develop
2016-11-29 15:21:48 +01:00
Tobias Hagemann
438ade1106
fixes #382
2016-11-27 14:28:44 +01:00
Markus Kreusch
fe86b4c593
Implemented #363
2016-11-14 22:26:55 +01:00
Markus Kreusch
a583afeb60
Merge branch 'feature/issue-393' into develop
2016-11-14 15:08:31 +01:00
Sebastian Stenzel
a585d3cf16
cherry picked from bac1d6f [ci skip]
2016-11-12 17:04:58 +01:00
Sebastian Stenzel
39ee8a9cde
coverity issue 151831
2016-11-11 17:11:21 +01:00
Markus Kreusch
1263b3af81
fixed 'a' really bad thing in the last commit
2016-11-11 09:56:45 +01:00
Markus Kreusch
dafa29d8a3
Implemented #393
2016-11-10 22:58:45 +01:00
Sebastian Stenzel
aab616d184
Updated CryptoLib, hopefully fixes #373
2016-11-10 15:11:04 +01:00
Sebastian Stenzel
70c3a38c49
invoking UI methods on UI thread, might solve #351
2016-11-10 14:07:37 +01:00
Sebastian Stenzel
c64294ac3e
Added chinese localizations, updated dutch localization
2016-11-10 13:41:09 +01:00
Markus Kreusch
82330db871
Additional logging for vault version upgrade
2016-11-09 15:54:10 +01:00
Sebastian Stenzel
355bbb5459
Merge branch 'develop' into patch-1
2016-11-06 21:53:28 +01:00
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
3e374a927c
Merge branch 'release/1.2.0'
...
# 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
2016-09-19 15:10:43 +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
a3cfcb1131
Reject opening files when former filesize header is != -1
2016-09-15 23:26:13 +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
df1fd6d0b3
fixed coverity issue 72979
2016-09-15 14:15:25 +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
5b18eff01a
increased cryptolib version to 1.0.2
...
[ci skip]
2016-09-15 13:28:20 +02:00
Sebastian Stenzel
47133c6f31
fixed change pw function leaving invalid JSON file if length gets shorter due to different encoding or pretty printing etc
2016-09-14 17:22:26 +02:00
Sebastian Stenzel
09ba4f5129
changed to jni lib version 1.0.0
2016-09-13 20:17:30 +02:00
Sebastian Stenzel
20d4047bed
changed to cryptolib version 1.0.1 (which includes sources) [ci skip]
2016-09-12 23:16:17 +02:00
Sebastian Stenzel
56b71ef7d9
depends on relase version of cryptolib 1.0.0
2016-09-12 21:28:21 +02:00
