Sebastian Stenzel
8359deb8eb
Merge branch 'feature/cryptofs' into develop
2017-03-06 22:33:55 +01:00
Sebastian Stenzel
e1f2330f95
Updated dependencies
2017-03-06 17:08:05 +01:00
Sebastian Stenzel
87014c4db2
fixed build
2017-03-01 19:04:34 +01:00
Sebastian Stenzel
c9eb9b1938
Dependency cleanup, migrated from commons-httpclient to org.apache.httpcomponents:httpclient
2017-03-01 18:59:37 +01:00
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
Sebastian Stenzel
a7fdf3d325
Merge pull request #454 from jordanbtucker/scrypt-typo
...
Fix typo in Scrypt Javadoc: `costParam` -> `blockSize`
2017-02-14 10:48:40 +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
Tobias Hagemann
76075ffec4
Update CONTRIBUTING.md
2017-02-10 01:52:13 +01:00
Tobias Hagemann
ed448146f7
Update CONTRIBUTING.md
2017-02-10 01:50:20 +01:00
Tobias Hagemann
638e9c1a8b
Update ISSUE_TEMPLATE.md
2017-02-10 01:37:21 +01:00
Markus Kreusch
1624cffb2a
Update README.md
2017-02-02 17:34:39 +01: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
40bd84a09c
updated contribution guide
2017-01-30 21:22:10 +01:00
Tobias Hagemann
0c0fb1c4c5
Merge branch 'release/1.2.4'
2017-01-27 11:22:14 +01:00
Tobias Hagemann
ab39bd1667
updated to version 1.2.4
2017-01-27 11:12:45 +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
cef3a5fc77
Merge branch 'release/1.2.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/keychain/pom.xml
# main/pom.xml
# main/uber-jar/pom.xml
# main/ui/pom.xml
2016-11-29 23:03:26 +01:00
Tobias Hagemann
9956f43fd9
updated to version 1.2.3
2016-11-29 22:24:26 +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
Sebastian Stenzel
fe54f4ec66
Update README.md
...
As suggested by @tallesh in #135
2016-11-27 10:14:34 +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
3db757193e
Merge branch 'hotfix/1.2.2'
2016-11-12 17:02:04 +01:00
Sebastian Stenzel
bac1d6fd83
Updated siv-mode to 1.2.0 to be consistent with CryptoLib
2016-11-12 16:41:26 +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
2bc6fe89ad
Merge branch 'release/1.2.1'
2016-11-10 15:23:11 +01:00
Sebastian Stenzel
8439216233
Updated version to 1.2.1
2016-11-10 15:13:28 +01:00
Sebastian Stenzel
aab616d184
Updated CryptoLib, hopefully fixes #373
2016-11-10 15:11:04 +01:00
