Skip to content

Commit

Permalink
Merge branch 'main' into mountainduck/5
Browse files Browse the repository at this point in the history
  • Loading branch information
dkocher committed Dec 25, 2024
2 parents 6ffdb56 + 1278480 commit 3d07755
Show file tree
Hide file tree
Showing 56 changed files with 1,571 additions and 875 deletions.
181 changes: 121 additions & 60 deletions cli/index.md

Large diffs are not rendered by default.

64 changes: 17 additions & 47 deletions cryptomator/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,14 @@ Choose *File → New Vault…* to create a new vault.

:::{image} _images/New_Encrypted_Vault_File_Menu_Option.png
:alt: New Encrypted Vault File Menu Option
:width: 400px
:width: 600px
:::

::::
::::{group-tab} Mountain Duck

1. Choose *New Vault…* from the Finder Extension toolbar or context menu using right-click in Finder or Windows Explorer.

:::{image} _images/Mountain_Duck_Create_New_Vault_Finder_Extension.png
:alt: Mountain Duck Create New Vault (Finder Extension)
:width: 400px
:::

:::{image} _images/Mountain_Duck_Create_New_Vault_Windows_Explorer.png
:alt: Mountain Duck Create New Vault (Windows Explorer)
:width: 400px
Expand Down Expand Up @@ -109,8 +104,8 @@ Choose the *Cryptomator* button in the toolbar or *File → Unlock Vault* and *F

Lock and unlock vaults within the Finder or Windows Explorer using the context menu:

`Mountain Duck → Cryptomator → Lock Vault`
`Mountain Duck → Cryptomator → Unlock Vault`
* *Mountain Duck → Cryptomator → Lock Vault*
* *Mountain Duck → Cryptomator → Unlock Vault*

:::
::::
Expand All @@ -121,25 +116,25 @@ The menu option is disabled if you have set Preferences → Cryptomator → Auto

### Save Passphrase

You can check *Add to Keychain* to save the passphrase to open the vault with the master key file in your login keychain. The checkbox is disabled by default. Another application that wants to access the vault passphrase from the login keychain will trigger a permission prompt.
Check *Save Password* to save the master key file passphrase of vaults.

:::::{tabs}
::::{group-tab} macOS

:::{image} _images/Keychain_Access_Crpytomator_Passphrase.png
Manage your passwords with *Keychain Access.app* on Mac. Refer to the [Keychain Access User Guide](https://support.apple.com/kb/PH20093?locale=en_US). Another application that wants to access the vault passphrase from the login keychain will trigger a permission prompt.

:::{image} _images/Keychain_Access_Cryptomator_Passphrase.png
:alt: Keychain Access Cryptomator Passphrase
:width: 400px
:::

::::{tabs}
:::{group-tab} macOS

Manage your passwords with *Keychain Access.app* on Mac. Refer to [Keychain for Mac: Keychain Access overview](https://support.apple.com/kb/PH20093?locale=en_US).

:::
:::{group-tab} Windows
::::
::::{group-tab} Windows

Passwords are saved in the *Credential Manager*. You can view and delete your saved login information in *Control Panel → User Accounts → Credential Manager → Windows Credentials*.

:::
::::
:::::

### File Transfers

Expand All @@ -157,7 +152,7 @@ You can open and browse multiple vaults on a server in a single browser window.

:::{image} _images/Cryptomator_Vault_Browser.png
:alt: Cryptomator Vault Browser
:width: 400px
:width: 600px
:::

### Moving Files Into Vault
Expand All @@ -170,39 +165,14 @@ The vault must be unlocked before you move files to it, otherwise the files won'

### Access Vaults on Local Disk

Both [Cyberduck](https://cyberduck.io/) and [Mountain Duck](https://mountainduck.io/) support browsing your local disk to access vaults created on your computer. Create a new [bookmark](../cyberduck/bookmarks) to connect to your local disk.

:::{image} _images/local_disk_connection.png
:alt: Local Disk Connection
:width: 400px
:::

In your local disk connection, you can access all directories which are saved on your local disk. This includes for example your local synchronized [Dropbox](../protocols/dropbox), [Google Drive](../protocols/googledrive) and [OneDrive](../protocols/onedrive) directories.

::::{admonition} Access a Cryptomator Vault on local disk on the example of Dropbox
:class: note

1. Navigate to the Dropbox directory and open the subdirectories until you reach your vault.
2. Double click your vault.
3. Type your set password in the password box. If you want you can save the password for easier access to this directory for further usage.
:::{image} _images/access_Cryptomator_vault_Mountain_Duck.png
:alt: Mountain Duck Cryptomator Vault
:width: 400px
:::
:::{image} _images/access_Cryptomator_vault_Cyberduck.png
:alt: Cyberduck Access Cryptomator Vault
:width: 400px
:::
4. Click the Continue button and your vault should open.

::::
Both [Cyberduck](../cyberduck/index.md) and [Mountain Duck](../mountainduck/index.md) support browsing your local disk to access vaults created on your computer. Refer to the [tutorial](../tutorials/vault_localdisk.md).

## Known Limitations

- As [Name shortening](https://docs.cryptomator.org/en/latest/security/architecture/#name-shortening) is not supported the maximum length for a filename (including extension) is 146 characters. Note that using non-ASCII characters in your filenames may lower this limit.
- As [name shortening](https://docs.cryptomator.org/en/latest/security/architecture/#name-shortening) is not supported, the maximum length for a filename (including extension) is 146 characters. Note that using non-ASCII characters in your filenames may lower this limit.
- Changing the vault passphrase is currently not supported.
- To delete a vault it cannot be unlocked. Choose *Cancel* in the vault password prompt to skip unlocking the vault after selecting the vault folder for delete.
- Creating or accessing a vault in a vault is currently not supported using Cyberduck.
- Creating or accessing a vault within a vault is currently not supported using Cyberduck.
- Locking or unlocking a vault requires network connectivity using Mountain Duck regardless of the [connect mode](../mountainduck/connect/index.md).

## Preferences
Expand Down
Loading

0 comments on commit 3d07755

Please sign in to comment.