Skip to content

Commit 65b7c2d

Browse files
eliandoraneliandoran
authored
Merge pull request #2249 from TriliumNext/odic
MFA docs improve
2 parents 9c38398 + 94e3586 commit 65b7c2d

File tree

18 files changed

+67
-64
lines changed

18 files changed

+67
-64
lines changed

‎apps/client/src/translations/cn/translation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@
13331333
"recovery_keys_used": "已使用: {{date}}",
13341334
"recovery_keys_unused": "恢复代码 {{index}} 未使用",
13351335
"oauth_title": "OAuth/OpenID 认证",
1336-
"oauth_description": "OpenID 是一种标准化方式，允许您使用其他服务（如 Google）的账户登录网站，以验证您的身份。请参阅这些 <a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">指南</a> 通过 Google 设置 OpenID 服务。",
1336+
"oauth_description": "OpenID 是一种标准化方式，允许您使用其他服务（如 Google）的账号登录网站来验证您的身份。默认的身份提供者是 Google，但您可以更改为任何其他 OpenID 提供者。点击<a href=\"#root/_hidden/_help/_help_Otzi9La2YAUX/_help_WOcw2SLH6tbX/_help_7DAiwaf8Z7Rz\">这里</a>了解更多信息。请参阅这些 <a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">指南</a> 通过 Google 设置 OpenID 服务。",
13371337
"oauth_description_warning": "要启用 OAuth/OpenID，您需要设置 config.ini 文件中的 OAuth/OpenID 基础 URL、客户端 ID 和客户端密钥，并重新启动应用程序。如果要从环境变量设置，请设置 TRILIUM_OAUTH_BASE_URL、TRILIUM_OAUTH_CLIENT_ID 和 TRILIUM_OAUTH_CLIENT_SECRET 环境变量。",
13381338
"oauth_missing_vars": "缺少以下设置项: {{missingVars}}",
13391339
"oauth_user_account": "用户账号：",

‎apps/client/src/translations/en/translation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1493,7 +1493,7 @@
14931493
"recovery_keys_used": "Used: {{date}}",
14941494
"recovery_keys_unused": "Recovery code {{index}} is unused",
14951495
"oauth_title": "OAuth/OpenID",
1496-
"oauth_description": "OpenID is a standardized way to let you log into websites using an account from another service, like Google, to verify your identity. Follow these <a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">instructions</a> to setup an OpenID service through Google.",
1496+
"oauth_description": "OpenID is a standardized way to let you log into websites using an account from another service, like Google, to verify your identity. The default issuer is Google, but you can change it to any other OpenID provider. Check <a href=\"#root/_hidden/_help/_help_Otzi9La2YAUX/_help_WOcw2SLH6tbX/_help_7DAiwaf8Z7Rz\">here</a> for more information. Follow these <a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">instructions</a> to setup an OpenID service through Google.",
14971497
"oauth_description_warning": "To enable OAuth/OpenID, you need to set the OAuth/OpenID base URL, client ID and client secret in the config.ini file and restart the application. If you want to set from environment variables, please set TRILIUM_OAUTH_BASE_URL, TRILIUM_OAUTH_CLIENT_ID and TRILIUM_OAUTH_CLIENT_SECRET.",
14981498
"oauth_missing_vars": "Missing settings: {{variables}}",
14991499
"oauth_user_account": "User Account: ",

‎apps/client/src/widgets/type_widgets/content_widget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import { t } from "../../services/i18n.js";
4545
import LanguageOptions from "./options/i18n/language.js";
4646
import type BasicWidget from "../basic_widget.js";
4747
import CodeTheme from "./options/code_notes/code_theme.js";
48-
import RelatedSettings from "./options/related_settings.js";
48+
import RelatedSettings from "./options/appearance/related_settings.js";
4949

5050
const TPL = /*html*/`<div class="note-detail-content-widget note-detail-printable">
5151
<style>

‎apps/client/src/widgets/type_widgets/options/related_settings.ts renamed to ‎apps/client/src/widgets/type_widgets/options/appearance/related_settings.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import type FNote from "../../../entities/fnote";
2-
import type { OptionPages } from "../content_widget";
3-
import OptionsWidget from "./options_widget";
1+
import type { OptionPages } from "../../content_widget";
2+
import OptionsWidget from "../options_widget";
43

54
const TPL = `\
65
<div class="options-section">

‎apps/server/src/assets/doc_notes/en/User Guide/!!!meta.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Nginx.html

Lines changed: 11 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Authentication.html

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/Multi-Factor Authentication.html

Lines changed: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/server/src/assets/doc_notes/en/User Guide/User Guide/Theme development/Reference.html

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/Developer Guide/!!!meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"formatVersion": 2,
3-
"appVersion": "0.94.0",
3+
"appVersion": "0.94.1",
44
"files": [
55
{
66
"isClone": false,

‎docs/Release Notes/!!!meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"formatVersion": 2,
3-
"appVersion": "0.94.0",
3+
"appVersion": "0.94.1",
44
"files": [
55
{
66
"isClone": false,

‎docs/Release Notes/Release Notes/v0.94.1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# v0.94.1
22
> [!NOTE]
3-
> *TriliumNext Notes* will rebrand itself back to Trilium Notes since @zadam was kind enough to give us the original name. See [#2190](https://github.com/orgs/TriliumNext/discussions/2190) for more info. This will probably be the "last" version branded as *TriliumNext Notes*.
3+
> _TriliumNext Notes_ will rebrand itself back to Trilium Notes since @zadam was kind enough to give us the original name. See [#2190](https://github.com/orgs/TriliumNext/discussions/2190) for more info. This will probably be the "last" version branded as _TriliumNext Notes_.
44
55
> [!IMPORTANT]
66
> If you enjoyed this release, consider showing a token of appreciation by:

‎docs/User Guide/!!!meta.json

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"formatVersion": 2,
3-
"appVersion": "0.94.0",
3+
"appVersion": "0.94.1",
44
"files": [
55
{
66
"isClone": false,
@@ -189,23 +189,23 @@
189189
{
190190
"type": "relation",
191191
"name": "internalLink",
192-
"value": "fDLvzOx29Pfg",
192+
"value": "0hzsNCP31IAB",
193193
"isInheritable": false,
194194
"position": 120
195195
},
196-
{
197-
"type": "label",
198-
"name": "shareAlias",
199-
"value": "server-installation",
200-
"isInheritable": false,
201-
"position": 30
202-
},
203196
{
204197
"type": "relation",
205198
"name": "internalLink",
206-
"value": "0hzsNCP31IAB",
199+
"value": "fDLvzOx29Pfg",
207200
"isInheritable": false,
208201
"position": 130
202+
},
203+
{
204+
"type": "label",
205+
"name": "shareAlias",
206+
"value": "server-installation",
207+
"isInheritable": false,
208+
"position": 10
209209
}
210210
],
211211
"format": "markdown",
@@ -269,14 +269,14 @@
269269
"name": "shareAlias",
270270
"value": "packaged-server-installation",
271271
"isInheritable": false,
272-
"position": 20
272+
"position": 10
273273
},
274274
{
275275
"type": "label",
276276
"name": "iconClass",
277277
"value": "bx bxl-tux",
278278
"isInheritable": false,
279-
"position": 30
279+
"position": 20
280280
}
281281
],
282282
"format": "markdown",
@@ -674,32 +674,32 @@
674674
"mime": "text/html",
675675
"attributes": [
676676
{
677-
"type": "label",
678-
"name": "iconClass",
679-
"value": "bx bx-lock-alt",
677+
"type": "relation",
678+
"name": "internalLink",
679+
"value": "wX4HbRucYSDD",
680680
"isInheritable": false,
681681
"position": 10
682682
},
683683
{
684684
"type": "relation",
685685
"name": "internalLink",
686-
"value": "7DAiwaf8Z7Rz",
686+
"value": "YKWqdJhzi2VY",
687687
"isInheritable": false,
688688
"position": 20
689689
},
690690
{
691691
"type": "relation",
692692
"name": "internalLink",
693-
"value": "wX4HbRucYSDD",
693+
"value": "7DAiwaf8Z7Rz",
694694
"isInheritable": false,
695695
"position": 30
696696
},
697697
{
698-
"type": "relation",
699-
"name": "internalLink",
700-
"value": "YKWqdJhzi2VY",
698+
"type": "label",
699+
"name": "iconClass",
700+
"value": "bx bx-lock-alt",
701701
"isInheritable": false,
702-
"position": 40
702+
"position": 10
703703
}
704704
],
705705
"format": "markdown",
@@ -736,19 +736,12 @@
736736
"isInheritable": false,
737737
"position": 10
738738
},
739-
{
740-
"type": "label",
741-
"name": "shareHiddenFromTree",
742-
"value": "",
743-
"isInheritable": false,
744-
"position": 20
745-
},
746739
{
747740
"type": "label",
748741
"name": "iconClass",
749742
"value": "bx bx-stopwatch",
750743
"isInheritable": false,
751-
"position": 30
744+
"position": 20
752745
}
753746
],
754747
"format": "markdown",

‎docs/User Guide/User Guide/Installation & Setup/Server Installation/2. Reverse proxy/Nginx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ Configure Nginx proxy and HTTPS. The operating system here is Ubuntu 18.04.
7373
proxy_read_timeout 90;
7474
}
7575
76-
```
76+
```

‎docs/User Guide/User Guide/Installation & Setup/Server Installation/Authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ When “Remember me” is unchecked, the behavior is different. At client/browse
2727

2828
The login sessions are now stored in the same <a class="reference-link" href="../../Advanced%20Usage/Database.md">Database</a> as the user data. In order to view which sessions are active, open the <a class="reference-link" href="../../Advanced%20Usage/Database/Manually%20altering%20the%20database/SQL%20Console.md">SQL Console</a> and run the following query:
2929

30-
```trilium
30+
```
3131
SELECT * FROM sessions
3232
```
3333

0 commit comments

Comments
 (0)