Skip to content

Commit d2658c1

Browse files
committed
Merge branch 'develop'
2 parents 0b65167 + 35a48a3 commit d2658c1

9 files changed

Lines changed: 2111 additions & 1052 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Verify lockfile has no non-registry sources
3131
run: scripts/check-lockfile.sh
3232
- name: Setup pnpm
33-
uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
33+
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
3434
- name: Setup Node.js
3535
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
3636
with:

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Add robots.txt for staging
6060
run: 'echo -e "User-agent: *\nDisallow: /" > public/robots.txt'
6161
- name: Deploy to Staging Repository
62-
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
62+
uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4.1.0
6363
with:
6464
personal_token: ${{ secrets.CRYPTOBOT_DEPLOY_STAGING_DOCS }}
6565
external_repository: cryptomator/docs-staging

.github/workflows/update-windows-info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
GH_TOKEN: ${{ secrets.CRYPTOBOT_PR_TOKEN }}
9292
- name: Slack Notification
9393
if: steps.commit-and-push.outputs.changed == 'true'
94-
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2.3.3
94+
uses: rtCamp/action-slack-notify@33ca3be66c6f378fe1610fd1d5258632dbed5e58 # v2.4.0
9595
env:
9696
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_CRYPTOMATOR_DESKTOP }}
9797
SLACK_USERNAME: 'Cryptobot'

docs/desktop/vault-management.mdx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,8 @@ The mount options depend on the selected [volume type](volume-type.mdx).
6161

6262
<Image src="/img/desktop/vault-options-password.png" alt="Vault options regarding the password" width="512" height="448" />
6363

64+
:::note
65+
If the `masterkey` file is not present in the vault directory, the functions in the `Password` tab are disabled. To use these functions again, place the `masterkey` file back into the vault directory or restore it using the vault recovery function.
66+
:::
67+
6468
Take a look at the [Volume Type](volume-type.mdx) and [Password And Recovery Key](password-and-recovery-key.mdx) sections to understand how vault mounting and passwords work.

docs/desktop/volume-type.mdx

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,18 @@ Vaults mounted to a drive letter are only accessible to the current user. If you
6969
**Requirements:** Windows
7070

7171
WebDAV on Windows uses the [`net use`](https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/gg651155(v=ws.11)) command to mount/unmount the virtual drive.
72-
By default, unlocked vaults are mounted as a network drive and assigned a random drive letter.
73-
Using WebDAV on Windows has the following drawbacks:
72+
The unlocked vaults is displayed as a network drive and assigned to a random drive letter.
73+
74+
:::info
75+
76+
WebDAV on Windows uses the native Windows WebDAV-Client. We recommend using [WinFsp](#winfsp) due to its restrictions:
77+
78+
* **Maximum file size of 4 GB:** Files bigger than 4GB cannot be copied into or out of the vault.
79+
* **Maximum path length of 260 characters:** Files with an absolute path longer than 260 characters cannot be accessed at all
80+
* **Wrong reported total and free space:** The total space and free space of the vault are always reported to be the same as the total space and free space of the C: drive, even if the vault is stored on a different drive
81+
82+
:::
7483

75-
* The size of transferred files is restricted to a maximum of 4 GB.
76-
* The total space and free space of the network drive are shown to be the same as the total space and free space of the C: drive, which is technically incorrect.
7784

7885
## macOS {/* #macos */}
7986

docs/misc/glossary.mdx

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
id: glossary
3+
title: Glossary
4+
sidebar_position: 5
5+
---
6+
7+
# Glossary
8+
9+
## Terms {/* #terms */}
10+
11+
### Account Key {/* #account-key */}
12+
13+
A sequence of digits and characters that looks like this: `535cf7e3-f305-4d97-9309-dcce813183cf`. It is used to authorize new devices to access your Cryptomator Hub account. It can be looked up in the profile of existing devices. If you lose it, you can reset your account, however doing so will revoke access from all vaults.
14+
15+
### Recovery Key {/* #recovery-key */}
16+
17+
A human-readable representation of a vault's master key that is supposed to be printed out and archived for the case that you ever forget or lose access to your regular passphrase.
18+
19+
## Localization of Terms {/* #localization-of-terms */}
20+
21+
:::warning
22+
Some of the terms mentioned above are carefully chosen to be distinguishable from another. This is particularly important for key material, as we deal with many different kinds of keys. **Mixing these up can cause confusion or even bear the risk of information exposure.**
23+
:::
24+
25+
Translating technical terms shall be considered with great care. Here are our official recommendations to translators:
26+
27+
1. If using English terms in the realm of software is common practice in your native language, *do not translate* these terms.
28+
2. Otherwise, if you feel uncertain about a translation, then better put the English term in parenthesis (if there is enough room).
29+
3. Only if you are absolutely confident, that a translation precisely reflects the meaning as defined in this glossary, translate it.
30+
31+
:::note
32+
We may add further terms in the future. If, for example, you deem it acceptable to translate *account* to something that has the same meaning as *user*, keep in mind that a translation of *account key* may eventually collide with *user key*.
33+
:::

package.json

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,37 @@
1717
"typecheck": "tsc"
1818
},
1919
"dependencies": {
20-
"@docusaurus/core": "^3.10.1",
21-
"@docusaurus/faster": "^3.10.1",
22-
"@docusaurus/plugin-client-redirects": "^3.10.1",
23-
"@docusaurus/preset-classic": "^3.10.1",
24-
"@easyops-cn/docusaurus-search-local": "^0.55.2",
20+
"@docusaurus/core": "^3.10.2",
21+
"@docusaurus/faster": "^3.10.2",
22+
"@docusaurus/plugin-client-redirects": "^3.10.2",
23+
"@docusaurus/preset-classic": "^3.10.2",
24+
"@easyops-cn/docusaurus-search-local": "^0.55.3",
2525
"@mdx-js/react": "^3.1.1",
2626
"@signalwire/docusaurus-plugin-llms-txt": "^1.2.2",
2727
"clsx": "^2.1.1",
2828
"prism-react-renderer": "^2.4.1",
29-
"react": "^19.2.7",
30-
"react-dom": "^19.2.7"
29+
"react": "^19.2.8",
30+
"react-dom": "^19.2.8"
3131
},
3232
"devDependencies": {
33-
"@docusaurus/module-type-aliases": "^3.10.1",
34-
"@docusaurus/tsconfig": "^3.10.1",
35-
"@docusaurus/types": "^3.10.1",
36-
"typescript": "~5.9.3"
33+
"@docusaurus/module-type-aliases": "^3.10.2",
34+
"@docusaurus/tsconfig": "^3.10.2",
35+
"@docusaurus/types": "^3.10.2",
36+
"typescript": "~6.0.3"
3737
},
38-
"overrides": {
39-
"copy-webpack-plugin": "14.0.0",
40-
"css-minimizer-webpack-plugin": "8.0.0"
38+
"pnpm": {
39+
"overrides": {
40+
"copy-webpack-plugin": "14.0.0",
41+
"css-minimizer-webpack-plugin": "8.0.0",
42+
"body-parser": "^1.20.6",
43+
"brace-expansion": "^1.1.18",
44+
"fast-uri": "^3.1.5",
45+
"postcss": "^8.5.23",
46+
"serialize-javascript": "^7.0.5",
47+
"svgo": "^3.3.4",
48+
"undici": "^7.29.0",
49+
"uuid": "^11.1.1"
50+
}
4151
},
4252
"browserslist": {
4353
"production": [

0 commit comments

Comments
 (0)