Sebastian Stenzel
fbfe2b0a31
Merge branch 'release/1.3.0-rc2'
2017-04-25 15:37:37 +02:00
Sebastian Stenzel
a719a83bce
Merge branch 'develop' into release/1.3.0-rc2
2017-04-25 15:36:54 +02:00
Sebastian Stenzel
d353a9cb9d
added OS name + version to version checker user agent header [ci skip]
2017-04-25 15:36:24 +02:00
Sebastian Stenzel
ee2e07a9a3
Updated dependencies and localization
2017-04-25 14:33:03 +02:00
Sebastian Stenzel
f6689043c7
Preparing 1.3.0-rc2
2017-04-24 16:45:06 +02:00
Sebastian Stenzel
45531dc54a
upgraded webdav-nio-adapter to 0.5.0
2017-04-24 15:46:57 +02:00
Sebastian Stenzel
0a26c192fe
Merge branch 'release/1.3.0-rc1' into develop
2017-04-20 16:12:54 +02:00
Sebastian Stenzel
281cfb74d9
Merge branch 'release/1.3.0-rc1'
...
# Conflicts:
# main/ant-kit/pom.xml
# main/commons-test/pom.xml
# main/commons/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/launcher/pom.xml
# main/pom.xml
# main/uber-jar/pom.xml
# main/ui/pom.xml
2017-04-20 16:11:37 +02:00
Sebastian Stenzel
0d03eeb5bd
Adjusted build config for 1.3.0
2017-04-20 15:02:29 +02:00
Sebastian Stenzel
36e669d729
Preparing 1.3.0-rc1
2017-04-20 14:49:32 +02:00
Sebastian Stenzel
b1f55d7cfe
updated version check url [ci skip]
2017-04-19 15:25:51 +02:00
Sebastian Stenzel
9aa8c46560
Updated SemVerComparator to support pre-release versions.
2017-04-19 15:09:30 +02:00
Sebastian Stenzel
2ed00ed02d
fixes #435
2017-04-19 14:02:37 +02:00
Sebastian Stenzel
5d56f5beb6
Enhanced error reporting [ci skip]
2017-04-19 00:12:10 +02:00
Sebastian Stenzel
1b937dfb06
renamed variable [ci skip]
2017-04-19 00:07:10 +02:00
Sebastian Stenzel
42be5330fe
Refactored FXML loading
2017-04-19 00:06:46 +02:00
Sebastian Stenzel
be8949157f
Removed unused classes
2017-04-18 13:46:25 +02:00
Sebastian Stenzel
93b2a4e07a
Refactored Cryptomator UI. Extracted Launcher to its own Maven module.
2017-04-18 13:40:59 +02:00
Sebastian Stenzel
ada1195a26
Updated dependencies, which fixes #473
2017-04-04 18:00:48 +02:00
Sebastian Stenzel
93563f68e0
fixes #430
2017-03-17 16:45:20 +01:00
Sebastian Stenzel
3faa0e83cc
fixes #387
2017-03-17 13:16:45 +01:00
Sebastian Stenzel
1985e2af72
fixes #452 and fixes #143
2017-03-15 12:13:34 +01:00
Sebastian Stenzel
3f03d36ad6
configurable mount + reveal during unlock, preparation for #452 and #143 (still needs a little refactoring, though)
2017-03-14 20:46:31 +01:00
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
