Skip to content

Commit 72d4465

Browse files
committed
Merge branch 'develop'
2 parents 5eddb12 + 1123f66 commit 72d4465

11 files changed

+41
-52
lines changed

docs/hub/access-vault.md

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,7 @@ Cryptomator should open your default browser for authentication. If you're not a
2929

3030
<Image src="/img/hub/unlock-authenticate.png" alt="After your browser asks for credentials, enter your username and password" width="1280" height="567" />
3131

32-
### 3. Account Setup {#account-setup}
33-
34-
If this is the first time you log into Hub, Cryptomator and Cryptomator Hub requests you to [set up your account](your-account.md#account-setup).
35-
36-
Desktop
37-
38-
<Image src="/img/hub/unlock-setup-required-desktop.png" alt="Cryptomator requests to setup your user account" width="715" height="541" />
39-
40-
Hub
41-
42-
<Image src="/img/hub/unlock-setup-required-hub.png" alt="Hub requests to setup your user account" width="1280" height="382" />
43-
44-
When you finished the account setup in Hub, unlock the vault again.
45-
46-
### 4. Register Device {#register-device}
32+
### 3. Register Device {#register-device}
4733

4834
If you just did setup your account, a vault owner needs to grant you access for the requested vault as described [here](vault-management.md#update-permissions). Retry unlocking the vault after the vault owner granted you access.
4935

@@ -63,7 +49,7 @@ Enter a name for the device to identify it later on and the [Account Key](your-a
6349

6450
After that, you will see a confirmation dialog, unlock the vault again.
6551

66-
### 5. Vault Unlocked {#vault-unlocked}
52+
### 4. Vault Unlocked {#vault-unlocked}
6753

6854
You are all set up and an unlock should be successful from now on. You can then reveal the vault's contents as usual.
6955

docs/misc/supported-cloud-services.md

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,30 @@ The following sections will provide you with an overview of [natively supported
2828

2929
The following Cloud Services are natively supported by Cryptomator for Android and/or Cryptomator for iOS.
3030

31-
| Cloud Service | Android [^1] | iOS |
31+
| Cloud Service | Android [^android-recommendation] | iOS |
3232
|:--------------|:-------------|:----|
33-
| Dropbox |[^2] ||
34-
| Google Drive |[^2] [^3] [^4] ||
35-
| OneDrive |[^2] ||
36-
| pCloud |[^2] ||
33+
| Dropbox |[^no-fdroid-main] ||
34+
| Google Drive |[^no-fdroid-main] [^no-fdroid-cryptomator] [^no-accrescent] ||
35+
| OneDrive |[^no-fdroid-main] ||
36+
| pCloud |[^no-fdroid-main] ||
3737
| S3 |||
3838
| Box.com |||
3939
| iCloud |||
4040
| Local device storage |||
41-
| Spaces provided by other apps [^5] |||
42-
| WebDAV [^6] |||
41+
| Spaces provided by other apps [^file-providers] |||
42+
| WebDAV [^webdav-list] |||
4343

44-
[^1]: **We recommend using the** [**Google Play Store variant**](/docs/android/setup.md#google-play-store) **of Cryptomator for Android users** for the best experience. Please see [here](/docs/android/setup.md#differences-between-variants-and-how-to-choose) for more information about the different Cryptomator for Android variants and the reasoning behind those.
44+
[^android-recommendation]: **We recommend using the** [**Google Play Store variant**](/docs/android/setup.md#google-play-store) **of Cryptomator for Android users** for the best experience. Please see [here](/docs/android/setup.md#differences-between-variants-and-how-to-choose) for more information about the different Cryptomator for Android variants and the reasoning behind those.
4545

46-
[^2]: Not supported by the [Main F-Droid repo variant](/docs/android/setup.md#main-f-droid-repository) because this Cloud Service requires an API key.
46+
[^no-fdroid-main]: Not supported by the [Main F-Droid repo variant](/docs/android/setup.md#main-f-droid-repository) because this Cloud Service requires an API key.
4747

48-
[^3]: Not supported by the [Cryptomator F-Droid repo variant](/docs/android/setup.md#cryptomator-f-droid-repository) because this Cloud Service requires proprietary dependencies.
48+
[^no-fdroid-cryptomator]: Not supported by the [Cryptomator F-Droid repo variant](/docs/android/setup.md#cryptomator-f-droid-repository) because this Cloud Service requires proprietary dependencies.
4949

50-
[^4]: Not supported by the [Accrescent variant](/docs/android/setup.md#accrescent) because this Cloud Service requires proprietary dependencies.
50+
[^no-accrescent]: Not supported by the [Accrescent variant](/docs/android/setup.md#accrescent) because this Cloud Service requires proprietary dependencies.
5151

52-
[^5]: Some Android and iOS apps integrate into the operating system's file manager with their own storage spaces to allow seamless access to their files via so called "File Providers." Cryptomator generally supports saving vaults in those spaces, but is dependent on those apps explicitly supporting access by other apps like Cryptomator. For more technical information about this see [here](https://github.com/cryptomator/android/issues/553) for Android and [here](https://github.com/cryptomator/ios/issues/51) for iOS.
52+
[^file-providers]: Some Android and iOS apps integrate into the operating system's file manager with their own storage spaces to allow seamless access to their files via so called "File Providers." Cryptomator generally supports saving vaults in those spaces, but is dependent on those apps explicitly supporting access by other apps like Cryptomator. For more technical information about this see [here](https://github.com/cryptomator/android/issues/553) for Android and [here](https://github.com/cryptomator/ios/issues/51) for iOS.
5353

54-
[^6]: Please see [Cloud Services with WebDAV support](#cloud-services-with-webdav-support) for a non-exhaustive list of Cloud Services and information about accessing them with WebDAV.
54+
[^webdav-list]: Please see [Cloud Services with WebDAV support](#cloud-services-with-webdav-support) for a non-exhaustive list of Cloud Services and information about accessing them with WebDAV.
5555

5656
## Cloud Services With WebDAV Support {#cloud-services-with-webdav-support}
5757

@@ -62,50 +62,53 @@ The following *non-exhaustive* table lays out information about Cloud Services t
6262
| 1&1 Online-Speicher (DSL) | `https://sd2dav.1und1.de` |
6363
| 1&1 Online-Speicher (Webhosting) | `https://webdav.office.1und1.de` |
6464
| blaucloud | `https://{username}.blaucloud.de/remote.php/webdav` |
65-
| Disroot [^7] | `https://cloud.disroot.org/remote.php/webdav/` |
65+
| Disroot [^disroot] | `https://cloud.disroot.org/remote.php/webdav/` |
6666
| freenetcloud | `https://webmail.freenet.de/webdav` |
6767
| GMX MediaCenter | `https://webdav.mc.gmx.net` |
68-
| HiDrive IONOS [^8] | `https://webdav.hidrive.ionos.com` |
69-
| HiDrive Strato [^9] | `https://webdav.hidrive.strato.com` |
70-
| IceDrive [^10] | `https://webdav.icedrive.io/` |
71-
| kDrive [^11] | `https://connect.drive.infomaniak.com` |
72-
| Koofr [^12] | `https://app.koofr.net/dav/Koofr` |
73-
| MagentaCLOUD [^13] | `https://magentacloud.de/remote.php/webdav` |
68+
| HiDrive IONOS [^hidrive-ionos] | `https://webdav.hidrive.ionos.com` |
69+
| HiDrive Strato [^hidrive-strato] | `https://webdav.hidrive.strato.com` |
70+
| IceDrive [^icedrive] | `https://webdav.icedrive.io/` |
71+
| kDrive [^kdrive] | `https://connect.drive.infomaniak.com` |
72+
| Koofr [^koofr] | `https://app.koofr.net/dav/Koofr` |
73+
| MagentaCLOUD [^magentacloud] | `https://magentacloud.de/remote.php/webdav` |
7474
| Mailbox.org | `https://dav.mailbox.org/servlet/webdav.infostore/` |
7575
| Mail.Ru | `https://webdav.cloud.mail.ru` |
76-
| Nextcloud [^14] | `https://{host}/{path}/remote.php/dav/files/{username}` |
77-
| ownCloud [^15] | `https://{host}/{path}/remote.php/webdav` |
78-
| pCloud (EU) [^16] | `https://ewebdav.pcloud.com` |
79-
| pCloud (US) [^16] | `https://webdav.pcloud.com` |
76+
| Nextcloud [^nextcloud] | `https://{host}/{path}/remote.php/dav/files/{username}` |
77+
| OpenCloud [^opencloud] | `https://{host}/remote.php/dav/spaces/{space-id}` |
78+
| ownCloud [^owncloud] | `https://{host}/{path}/remote.php/webdav` |
79+
| pCloud (EU) [^pcloud] | `https://ewebdav.pcloud.com` |
80+
| pCloud (US) [^pcloud] | `https://webdav.pcloud.com` |
8081
| Seafile (self-hosted) | `https://{host}/{path}/seafdav` |
8182
| STACK | `https://{username}.stackstorage.com/remote.php/webdav` |
8283
| SWITCHdrive | `https://drive.switch.ch/remote.php/dav/files/{username}` |
8384
| Syncwerk (formerly Seafile.de) | `https://app.syncwerk.com/seafdav` |
8485
| WEB.DE Online-Speicher | `https://webdav.smartdrive.web.de` |
8586
| wölkli | `https://cloud.woelkli.com/remote.php/webdav` |
86-
| Yandex.Disk [^17] | `https://webdav.yandex.com` |
87+
| Yandex.Disk [^yandex] | `https://webdav.yandex.com` |
8788

88-
[^7]: Disroot: To login, you must provide your disroot username (or your email if you are using your own domain) and your password. If 2FA is enabled you will have to generate an app-specific password.
89+
[^disroot]: Disroot: To login, you must provide your disroot username (or your email if you are using your own domain) and your password. If 2FA is enabled you will have to generate an app-specific password.
8990

90-
[^8]: HiDrive IONOS: When using 2FA WebDAV requires the OTP provided next to the password but it is only valid for 30 minutes then (see [here \[de\]](https://www.ionos.de/hilfe/hidrive/sicherheit-in-hidrive/aktivieren-der-zwei-faktor-authentifizierung/))
91+
[^hidrive-ionos]: HiDrive IONOS: When using 2FA WebDAV requires the OTP provided next to the password but it is only valid for 30 minutes then (see [here \[de\]](https://www.ionos.de/hilfe/hidrive/sicherheit-in-hidrive/aktivieren-der-zwei-faktor-authentifizierung/))
9192

92-
[^9]: HiDrive Strato: When using 2FA WebDAV requires the OTP provided next to the password but it is only valid for 60 minutes then (see [here \[de\]](https://www.strato.de/faq/cloud-speicher/2-Faktor-Authentifizierung/))
93+
[^hidrive-strato]: HiDrive Strato: When using 2FA WebDAV requires the OTP provided next to the password but it is only valid for 60 minutes then (see [here \[de\]](https://www.strato.de/faq/cloud-speicher/2-Faktor-Authentifizierung/))
9394

94-
[^10]: IceDrive: WebDAV requires a paid plan and a separate access key as password. (see [here](https://icedrive.net/help/account/does-icedrive-support-webdav))
95+
[^icedrive]: IceDrive: WebDAV requires a paid plan and a separate access key as password. (see [here](https://icedrive.net/help/account/does-icedrive-support-webdav))
9596

96-
[^11]: kDrive: WebDAV support is disabled for free users.
97+
[^kdrive]: kDrive: WebDAV support is disabled for free users.
9798

98-
[^12]: Koofr: WebDAV access requires a separate app password.
99+
[^koofr]: Koofr: WebDAV access requires a separate app password.
99100

100-
[^13]: MagentaCLOUD: WebDAV access requires a separate protocol password.
101+
[^magentacloud]: MagentaCLOUD: WebDAV access requires a separate protocol password.
101102

102-
[^14]: Nextcloud: WebDAV requires an app-specific password when 2FA is enabled.
103+
[^nextcloud]: Nextcloud: WebDAV requires an app-specific password when 2FA is enabled.
103104

104-
[^15]: ownCloud: WebDAV requires an app-specific password when 2FA is enabled.
105+
[^opencloud]: OpenCloud: WebDAV requires an App Token generated from Settings > App Tokens. The `{space-id}` is obtained from the info panel of the resource in OpenCloud.
105106

106-
[^16]: pCloud: WebDAV access is disabled when 2FA is enabled. Requires a paid plan.
107+
[^owncloud]: ownCloud: WebDAV requires an app-specific password when 2FA is enabled.
107108

108-
[^17]: Yandex.Disk: WebDAV requires an app-specific password when 2FA is enabled.
109+
[^pcloud]: pCloud: WebDAV access is disabled when 2FA is enabled. Requires a paid plan.
110+
111+
[^yandex]: Yandex.Disk: WebDAV requires an app-specific password when 2FA is enabled.
109112

110113
## Incompatible Cloud Services {#incompatible-cloud-services}
111114

304 KB
Loading
315 KB
Loading
330 KB
Loading
329 KB
Loading
383 KB
Loading
429 KB
Loading
408 KB
Loading
394 KB
Loading

0 commit comments

Comments
 (0)