From 9d4c05b6ce1b4136631130cf3303efbc169f638c Mon Sep 17 00:00:00 2001 From: Mohammad Rahmani <830394+kookma@users.noreply.github.com> Date: Tue, 7 Apr 2020 21:18:21 +0430 Subject: [PATCH 1/3] Signing the CLA (#4235) Co-authored-by: Jeremy Ruston --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 2bfa76cc7..5d85304cf 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -374,6 +374,8 @@ Marica Odagaki, @ento, 2019/08/30 Mark Stegeman, @markstegeman, 2019/08/31 +Mohammad Rahmani, @kookma, 2019/09/03 + Jan-Oliver Kaiser, @janno, 2019/09/06 Xavier Maysonnave, @xmaysonnave, 2019/11/08 From e8506813fe90292adba782a2b36d43e90a0c886c Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Tue, 7 Apr 2020 20:32:40 +0100 Subject: [PATCH 2/3] Docs: fix broken link Fixes #4266 --- editions/tw5.com/tiddlers/definitions/GitHub.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/definitions/GitHub.tid b/editions/tw5.com/tiddlers/definitions/GitHub.tid index 28a097a73..adbe968bd 100644 --- a/editions/tw5.com/tiddlers/definitions/GitHub.tid +++ b/editions/tw5.com/tiddlers/definitions/GitHub.tid @@ -10,4 +10,4 @@ The code and documentation of TiddlyWiki is hosted on GitHub at: https://github.com/Jermolene/TiddlyWiki5 -GitHub also offer a free web hosting service called [[GitHub Pages|https://pages.github.com/]] that can be used directly from the single file configuration. See [[Saving to GitHub]]. +GitHub also offer a free web hosting service called [[GitHub Pages|https://pages.github.com/]] that can be used directly from the single file configuration. See [[Saving to a Git service]]. From d2f2d7a11b509f6249fa7b593cb13bdf94969d95 Mon Sep 17 00:00:00 2001 From: Matt Lauber Date: Tue, 7 Apr 2020 15:44:08 -0400 Subject: [PATCH 3/3] Update jsonstringify Operator.tid (#4348) --- .../tw5.com/tiddlers/filters/jsonstringify Operator.tid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid b/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid index d9fd288b7..ff361450e 100644 --- a/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid +++ b/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid @@ -15,11 +15,11 @@ The following substitutions are made: |!Character |!Replacement | |`\` |`\\` | -|`"` |`\\"` | +|`"` |`\"` | |`\r` (carriage return) |`\\r` | |`\n` (line feed) |`\\n` | -|`\x08` (backpsace) |`\\b` | -|`\x0c` (formfield) |`\\f` | +|`\x08` (backspace) |`\\b` | +|`\x0c` (form field) |`\\f` | |`\t` (tab) |`\\t` | |Characters from 0x00 to 0x1f |`\\x##` where ## is two hex digits | |Characters from 0x80 to 0xffff |`\\u####` where #### is four hex digits |