 Armin Schrenk
|
e221019b57
Merge branch 'develop' into release/1.7.0
|
2 anni fa |
|
Armin Schrenk
|
eeaaced976
reorder settingsJsonAdapter switch statements
|
2 anni fa |
|
Armin Schrenk
|
d246b54268
ignore lastWrittenByVersion when reading settings
|
2 anni fa |
|
Armin Schrenk
|
e94572960e
enable drag and drop for linux aswell
|
2 anni fa |
|
Armin Schrenk
|
2d1c59bea9
Renamed objects related to license exceeded user flow
|
2 anni fa |
|
Armin Schrenk
|
921cbd6439
Merge branch 'develop' into release/1.7.0
|
2 anni fa |
|
Armin Schrenk
|
f811144ffa
pom cleanup [ci skip]
|
2 anni fa |
|
Armin Schrenk
|
2ecc711f50
bump dependencies
|
2 anni fa |
|
Armin Schrenk
|
cfcc8782ef
bump cryptomator dependencies to stable versions
|
2 anni fa |
|
Armin Schrenk
|
a1379bac40
For Windows try to migrate all user settings, not only the ones of local users
|
2 anni fa |
|
Armin Schrenk
|
fe3f2b5bd3
Merge branch 'develop' into release/1.7.0
|
2 anni fa |
 Cryptobot
|
7fc07ae02c
New Crowdin updates (#2689)
|
2 anni fa |
|
Armin Schrenk
|
2a70e2f0f4
Merge pull request #2686 from cryptomator/feature/recovery-key-wrong-key
|
2 anni fa |
 Tobias Hagemann
|
ffe0302fba
updated access modifier
|
2 anni fa |
|
Armin Schrenk
|
c5b86bc355
Closes #2648
|
2 anni fa |
|
Armin Schrenk
|
5f86473e3e
fix recovery key state logic
|
2 anni fa |
|
Armin Schrenk
|
a91c74b6eb
Revert "Update translation key"
|
2 anni fa |
|
Armin Schrenk
|
76949d6ccb
Update src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java
|
2 anni fa |
|
Armin Schrenk
|
71a09eae67
Update translation key
|
2 anni fa |
|
Armin Schrenk
|
8087fcecfb
Apply suggestions from code review
|
2 anni fa |
|
Armin Schrenk
|
29c73e1bc8
display different messages if recovery key is either not valid or does not belong to the vault
|
2 anni fa |
|
Armin Schrenk
|
8bbdb69cda
Update doc links to 1.7
|
2 anni fa |
|
Armin Schrenk
|
e9ee15dcd5
add info about html comments to error form
|
2 anni fa |
|
Armin Schrenk
|
03f6e0a33c
Use Label instead of Text
|
2 anni fa |
|
Armin Schrenk
|
c5b21b0d8c
Add warning about error report deletion to the error controller
|
2 anni fa |
|
Armin Schrenk
|
c5c5e297b7
Fix getCiphertextPath for Windows again.
|
2 anni fa |
|
Armin Schrenk
|
24839985e9
Merge branch 'develop' into release/1.7.0
|
2 anni fa |
|
Armin Schrenk
|
a7b2802f34
show correct error message when using custom mountpoint with webdav (Http address)
|
2 anni fa |
|
Armin Schrenk
|
c85d0b4beb
bump webdav-nio-adapter
|
2 anni fa |
|
Armin Schrenk
|
3dff3a8664
Fixes #2682
|
2 anni fa |
