From 65afdacdfeb2b48f9216e9b96c3f92b6c0f3d9c5 Mon Sep 17 00:00:00 2001 From: Leilei332 Date: Mon, 21 Apr 2025 02:44:39 +0800 Subject: [PATCH 1/4] Remove links in field descriptions (#9036) --- core/language/en-GB/Fields.multids | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/language/en-GB/Fields.multids b/core/language/en-GB/Fields.multids index 9830e96c1b..61835821a9 100644 --- a/core/language/en-GB/Fields.multids +++ b/core/language/en-GB/Fields.multids @@ -4,12 +4,12 @@ _canonical_uri: The full URI of an external image tiddler author: Name of the author of a plugin bag: The name of the bag from which a tiddler came caption: The text to be displayed on a tab or button -class: The CSS class applied to a tiddler when rendering it - see [[Custom styles by user-class]]. Also used for [[Modals]] +class: The CSS class applied to a tiddler when rendering it. Also used for Modals code-body: The view template will display the tiddler as code if set to ''yes'' color: The CSS color value associated with a tiddler -component: The name of the component responsible for an [[alert tiddler|AlertMechanism]] +component: The name of the component responsible for an alert tiddler core-version: For a plugin, indicates what version of TiddlyWiki with which it is compatible -current-tiddler: Used to cache the top tiddler in a [[history list|HistoryMechanism]] +current-tiddler: Used to cache the top tiddler in a history list created: The date a tiddler was created creator: The name of the person who created a tiddler dependents: For a plugin, lists the dependent plugin titles From 271b8f9e0df1ef4920046a2eb91efea84f801b73 Mon Sep 17 00:00:00 2001 From: MatthewSalmon <43498574+matthewsalmon@users.noreply.github.com> Date: Sun, 27 Apr 2025 09:24:16 +0100 Subject: [PATCH 2/4] Update cla-individual.md (#9039) Signing the CLA with GitHub handle --- licenses/cla-individual.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 4033e9fc16..ba091524d3 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -611,4 +611,7 @@ Galen Huntington, @galenhuntington, 2025/01/19 @Rhys-T, 2025/01/23 @Rumman157, 2025/03/17 -@bob.jansen@cultconv.com, 2025/03/22 \ No newline at end of file + +@bob.jansen@cultconv.com, 2025/03/22 + +Matthew Salmon, @matthewsalmon, 2025/04/24 From 1519ff638db064985a364cb9f803f06ecf183347 Mon Sep 17 00:00:00 2001 From: MatthewSalmon <43498574+matthewsalmon@users.noreply.github.com> Date: Sun, 27 Apr 2025 21:43:41 +0100 Subject: [PATCH 3/4] Update JavaScript Macros.tid (#9037) Removed "tt" in cannot --- editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid index d861de2326..3e44263dda 100644 --- a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid +++ b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid @@ -28,5 +28,5 @@ Note that JavaScript macros work on both the client and the server, and so do no !! Macro Behaviour -Macros are just used to return a chunk of wikitext for further processing. They should not make modifications to tiddlers in the wiki store. The reason is that you cannott control when the macro is called; it may be called repeatedly as part of refresh processing. So it is important that macros do not have any other side effects beyond generating their text. +Macros are just used to return a chunk of wikitext for further processing. They should not make modifications to tiddlers in the wiki store. The reason is that you cannot control when the macro is called; it may be called repeatedly as part of refresh processing. So it is important that macros do not have any other side effects beyond generating their text. From 4060f762e07e1f43d031410b3ebc7c7bdd03ab95 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Tue, 29 Apr 2025 14:01:43 +0100 Subject: [PATCH 4/4] Cherry pick 1519ff638db064985a364cb9f803f06ecf183347 from master --- editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid index d861de2326..d70ed70cce 100644 --- a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid +++ b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid @@ -28,5 +28,4 @@ Note that JavaScript macros work on both the client and the server, and so do no !! Macro Behaviour -Macros are just used to return a chunk of wikitext for further processing. They should not make modifications to tiddlers in the wiki store. The reason is that you cannott control when the macro is called; it may be called repeatedly as part of refresh processing. So it is important that macros do not have any other side effects beyond generating their text. - +Macros are just used to return a chunk of wikitext for further processing. They should not make modifications to tiddlers in the wiki store. The reason is that you cannot control when the macro is called; it may be called repeatedly as part of refresh processing. So it is important that macros do not have any other side effects beyond generating their text.