Sebastian Stenzel
|
25b9722019
|
Use CompletableFuture instead of UserInteractionLock + AtomicReference
|
2021-12-15 17:19:59 +01:00 |
|
Sebastian Stenzel
|
157bef5df6
|
close dialog after successful device registration (to be improved lol)
|
2021-12-15 17:19:00 +01:00 |
|
Armin Schrenk
|
36f87b3643
|
closes #1961
|
2021-12-15 12:46:23 +01:00 |
|
Armin Schrenk
|
8ac7ba8f56
|
preparing hotfix 1.6.5
|
2021-12-15 12:45:52 +01:00 |
|
Sebastian Stenzel
|
ef281f810f
|
register device via rest api
|
2021-12-14 17:35:24 +01:00 |
|
JaniruTEC
|
46a3a4fc11
|
Added error message if user tries to mount to occupied drive.
Fixes #1888
|
2021-12-13 00:46:18 +01:00 |
|
Armin Schrenk
|
921dd8fe67
|
Add query to redirection to provide more context in the frontend (#1973)
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
|
2021-12-10 13:42:37 +01:00 |
|
Sebastian Stenzel
|
fb580ff79d
|
read masterkey from JWE
|
2021-12-09 14:03:39 +01:00 |
|
Sebastian Stenzel
|
0110e5bedd
|
added JWE decryption helper
|
2021-12-09 14:02:39 +01:00 |
|
Sebastian Stenzel
|
0fd6e5bbb0
|
fixed code smells
|
2021-12-03 12:17:07 +01:00 |
|
Sebastian Stenzel
|
f277d4d21b
|
fix resource leak
|
2021-12-03 12:10:40 +01:00 |
|
Sebastian Stenzel
|
085304ec04
|
set up SonarCloud
|
2021-12-02 17:16:01 +01:00 |
|
Armin Schrenk
|
335a91d24a
|
reset to snapshot version
[ci skip]
|
2021-12-02 12:34:09 +01:00 |
|
Armin Schrenk
|
e0a3b7a9df
|
Merge branch 'release/1.6.4'
1.6.4
|
2021-12-02 12:24:47 +01:00 |
|
Armin Schrenk
|
c6a1690753
|
Merge tag '1.6.4' into develop
1.6.4
|
2021-12-02 12:24:47 +01:00 |
|
Armin Schrenk
|
4e3742c206
|
Merge branch 'develop' into release/1.6.4
|
2021-12-02 12:22:29 +01:00 |
|
Armin Schrenk
|
919257a99e
|
Bump dagger
|
2021-12-02 11:23:27 +01:00 |
|
Sebastian Stenzel
|
ae6766fa79
|
Merge pull request #1823 from purejava/feature/displayName
Pass the name of the vault on storing and changing a passphrase
|
2021-12-02 09:00:03 +01:00 |
|
Sebastian Stenzel
|
2c42a9573e
|
Merge branch 'develop' into feature/displayName
# Conflicts:
# pom.xml
|
2021-12-02 08:52:40 +01:00 |
|
Sebastian Stenzel
|
4baf05e684
|
prepare 1.6.4
|
2021-12-02 08:46:35 +01:00 |
|
Cryptobot
|
61d84a0da7
|
New Crowdin updates (#1894)
* New translations strings.properties
[ci skip]
|
2021-12-02 08:45:23 +01:00 |
|
Sebastian Stenzel
|
799b2c91bf
|
Merge branch 'feature/patch-webdav' into develop
# Conflicts:
# dist/win/contrib/patchWebDAV.ps1
# dist/win/resources/main.wxs
|
2021-12-01 14:01:02 +01:00 |
|
Armin Schrenk
|
eee672f9ee
|
closes #1932, closes #1931
|
2021-12-01 13:53:51 +01:00 |
|
Sebastian Stenzel
|
9f4a7c8cce
|
renamed scripts
|
2021-12-01 12:35:01 +01:00 |
|
Armin Schrenk
|
b9bbbc1f86
|
Bump javafx
|
2021-11-30 17:02:37 +01:00 |
|
Armin Schrenk
|
13e9775458
|
Closes #1918
|
2021-11-29 17:33:11 +01:00 |
|
Armin Schrenk
|
e9e5df6310
|
Bump dependencies:
* cryptofs
* gson
* logback
Closes #1825
|
2021-11-29 17:31:27 +01:00 |
|
Sebastian Stenzel
|
2808d777e0
|
Add cryptomator-vault alias to etc/hosts during (re)install (#1914)
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
|
2021-11-29 16:37:23 +01:00 |
|
Sebastian Stenzel
|
3cd99f680a
|
Merge branch 'develop' into feature/hub
|
2021-11-24 16:23:10 +01:00 |
|
Sebastian Stenzel
|
9b8661fe3c
|
use setup-java@v2 in release action
|
2021-11-24 16:22:09 +01:00 |
|
Sebastian Stenzel
|
34e4383c1e
|
adjust release build to support hub features
|
2021-11-24 14:46:21 +01:00 |
|
Tobias Hagemann
|
d4c3f02d8a
|
beautified hub_register_device
|
2021-11-18 17:02:58 +01:00 |
|
Martin Beyer
|
63b40091ea
|
rename supporterCert WhiteSpace and VaultNameLength methods
|
2021-11-18 12:06:50 +01:00 |
|
Sebastian Stenzel
|
0c47af2f15
|
Merge pull request #1935 from cryptomator/feature/lock-retry-loop
Handle exception when force-locking
|
2021-11-17 16:00:41 +01:00 |
|
Sebastian Stenzel
|
5a735191a4
|
adjust heading
(as it applies to both graceful and forced lock attempts)
|
2021-11-17 14:05:42 +01:00 |
|
Sebastian Stenzel
|
21d342d117
|
Add non-forced retry lock button
|
2021-11-17 14:03:04 +01:00 |
|
Sebastian Stenzel
|
1b43bf395f
|
apply same error handling to "force lock" as well
|
2021-11-17 13:45:43 +01:00 |
|
Sebastian Stenzel
|
839175a5e6
|
Merge branch 'develop' into feature/hub
# Conflicts:
# pom.xml
|
2021-11-11 16:04:26 +01:00 |
|
Sebastian Stenzel
|
71a575e079
|
add build scripts for windows
[ci skip]
|
2021-11-10 16:08:11 +01:00 |
|
Sebastian Stenzel
|
c5b6d8f81f
|
target Ubuntu Bionic in PPA release (#1909)
|
2021-11-10 12:20:52 +01:00 |
|
Tobias Hagemann
|
0c6ecef92b
|
Update README.md
[ci skip]
|
2021-11-10 08:51:50 +01:00 |
|
Tobias Hagemann
|
b565a5a3f4
|
added dmg step to mac build script
[ci skip]
|
2021-11-09 15:49:25 +01:00 |
|
Armin Schrenk
|
ce9e1184ec
|
bump cryptofs dependency
|
2021-11-09 12:39:45 +01:00 |
|
Armin Schrenk
|
c1c5367e2a
|
closes #1891
|
2021-11-03 11:54:24 +01:00 |
|
Sebastian Stenzel
|
55a0fe97d8
|
Merge branch 'main' into develop
[ci skip]
|
2021-11-03 09:01:45 +01:00 |
|
Sebastian Stenzel
|
f7f1afbf7d
|
Merge branch 'release/1.6.3'
1.6.3
|
2021-11-03 09:01:11 +01:00 |
|
Sebastian Stenzel
|
14395516c5
|
preparing 1.6.3
|
2021-11-03 08:59:12 +01:00 |
|
Cryptobot
|
9ef9499506
|
New Crowdin updates (#1886)
* New translations strings.properties
[ci skip]
|
2021-11-03 08:58:04 +01:00 |
|
Sebastian Stenzel
|
1ca803691b
|
Revert "increase robustness of vault creation:"
This reverts commit f7fdb87d6d.
|
2021-11-03 08:57:35 +01:00 |
|
Sebastian Stenzel
|
5924e443fb
|
Merge branch 'develop' into feature/hub
# Conflicts:
# .idea/runConfigurations/Cryptomator_Linux.xml
# .idea/runConfigurations/Cryptomator_Linux_Dev.xml
# .idea/runConfigurations/Cryptomator_Windows.xml
# .idea/runConfigurations/Cryptomator_Windows_Dev.xml
# .idea/runConfigurations/Cryptomator_macOS.xml
# .idea/runConfigurations/Cryptomator_macOS_Dev.xml
# pom.xml
|
2021-11-02 15:53:23 +01:00 |
|