From 790d6068850d6a397d4833ee05c7abd96ecf413e Mon Sep 17 00:00:00 2001 From: Marxsal Date: Sun, 27 Jan 2019 06:28:33 -0800 Subject: [PATCH 1/8] Docs: fixing header typo (#3722) --- editions/tw5.com/tiddlers/howtos/Editor toolbar.tid | 4 ---- 1 file changed, 4 deletions(-) diff --git a/editions/tw5.com/tiddlers/howtos/Editor toolbar.tid b/editions/tw5.com/tiddlers/howtos/Editor toolbar.tid index 54d7bbb62..6f176375d 100644 --- a/editions/tw5.com/tiddlers/howtos/Editor toolbar.tid +++ b/editions/tw5.com/tiddlers/howtos/Editor toolbar.tid @@ -4,10 +4,6 @@ tags: Features [[Formatting text in TiddlyWiki]] title: Editor toolbar type: text/vnd.tiddlywiki -tags: Features [[Formatting text in TiddlyWiki]] -title: Editor toolbar -type: text/vnd.tiddlywiki - !! How it Works The editor toolbar is a toolbar that helps you format text easily. It appears above the text input field in a tiddler when in edit mode. It has a similar appearance to desktop text editors like Microsoft Word or Libre Office Write. From 07aeaaa1a42140ea1e1c820d91cf23f428f9ec67 Mon Sep 17 00:00:00 2001 From: 00SS <38947777+00SS@users.noreply.github.com> Date: Sun, 27 Jan 2019 21:29:46 +0700 Subject: [PATCH 2/8] Docs: Update Hidden Setting SaveWikiButton Filename.tid (#3721) Rewording to make clearer --- .../Hidden Setting SaveWikiButton Filename.tid | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Filename.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Filename.tid index 4d56d03e2..4b6b103bc 100644 --- a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Filename.tid +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SaveWikiButton Filename.tid @@ -1,13 +1,11 @@ created: 20181215154811835 -modified: 20181215154811835 +modified: 20190122000000000 tags: [[Hidden Settings]] title: Hidden Setting: Filename for Save Wiki Button type: text/vnd.tiddlywiki -<<.from-version "5.1.19">> This value is wikified to determine the filename when saving via the "save wiki" page control button. +<<.from-version "5.1.19">> When saving a ~TiddlyWiki using the <<.button save-wiki>> button, the default file name used for saving is constructed using the Title of the ~TiddlyWiki as entered in the [[Control Panel|$:/ControlPanel]], which is stored in the tiddler [[$:/SiteTitle]]. -By default, this setting is empty, which triggers the default handling where the filename portion of the URL is used. +The value used is in the form `{{$:/SiteTitle}}.html`. This causes the filename to be constructed from the site Title with a `.html` extension. -The value `{{$:/SiteTitle}}.html` causes the filename to be constructed from the site title with a `.html` extension. - -$:/config/SaveWikiButton/Filename +If a tiddler named [[$:/config/SaveWikiButton/Filename]] is created, the text in that tiddler will be used as the default file name used for saving the ~TiddlyWiki. From 72ec4d05e4b7255f5100148413f1ca180442233e Mon Sep 17 00:00:00 2001 From: 00SS <38947777+00SS@users.noreply.github.com> Date: Sun, 27 Jan 2019 21:31:39 +0700 Subject: [PATCH 3/8] Update Editor toolbar.tid (#3720) Small corrections --- editions/tw5.com/tiddlers/howtos/Editor toolbar.tid | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/howtos/Editor toolbar.tid b/editions/tw5.com/tiddlers/howtos/Editor toolbar.tid index 6f176375d..4fb333d3c 100644 --- a/editions/tw5.com/tiddlers/howtos/Editor toolbar.tid +++ b/editions/tw5.com/tiddlers/howtos/Editor toolbar.tid @@ -8,13 +8,12 @@ type: text/vnd.tiddlywiki The editor toolbar is a toolbar that helps you format text easily. It appears above the text input field in a tiddler when in edit mode. It has a similar appearance to desktop text editors like Microsoft Word or Libre Office Write. - !! What the Editor toolbar does When you press the button for a function, it will insert the WikiText in the text field. As an example, if you press the bold button it will insert `'' ''`. If you ''highlight'' a piece of text the markup code will automatically go around the highlighted text. -If you are in another mode, like MarkDown, the toolbar will change to that syntax and insert appropriate code. However It will not change previously typed text or markup. +If you are in another mode, like [[MarkDown|Markdown Plugin]], the toolbar will change to that syntax and insert appropriate code. However It will not change previously typed text or markup. Besides the standard WikiText formatting, the Editor toolbar has the following buttons: From fc3227831f6d9a95e3aaf619aa8ad00fab21383f Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 27 Jan 2019 14:35:58 +0000 Subject: [PATCH 4/8] Docs: fix HTTPS command typos Fixes #3713 --- editions/tw5.com/tiddlers/webserver/Using HTTPS.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/webserver/Using HTTPS.tid b/editions/tw5.com/tiddlers/webserver/Using HTTPS.tid index 90aec56af..52d3aab96 100644 --- a/editions/tw5.com/tiddlers/webserver/Using HTTPS.tid +++ b/editions/tw5.com/tiddlers/webserver/Using HTTPS.tid @@ -15,5 +15,5 @@ To create the required certificate files with the popular [[openssl|https://www. ``` openssl req -newkey rsa:2048 -new -nodes -keyout mywikifolder/key.pem -out mywikifolder/csr.pem openssl x509 -req -days 365 -in mywikifolder/csr.pem -signkey mywikifolder/key.pem -out mywikifolder/server.crt -tiddlywiki mywikifolder --listen username=joe password=bloggs tlskey=key.pem tlscert=server.crt +tiddlywiki mywikifolder --listen username=joe password=bloggs tls-key=key.pem tls-cert=server.crt ``` From 95aca1171990a9a5882962cfeb050daeaa12296b Mon Sep 17 00:00:00 2001 From: JesseWeinstein Date: Sun, 27 Jan 2019 06:53:58 -0800 Subject: [PATCH 5/8] Signing the CLA (#3695) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index f9a075206..dd489ad1f 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -349,3 +349,5 @@ Moritz Ulrich, @the-kenny, 2019/01/03 Johannes Löthberg, @kyrias, 2019/01/07 Ben Webber, @benwebber, 2019/01/09 + +Jesse Weinstein, @JesseWeinstein, 2019/01/14 From 036ea400c55caf833520cc6c81b0d7f2f7ce6b8a Mon Sep 17 00:00:00 2001 From: admls <43248857+admls@users.noreply.github.com> Date: Sun, 27 Jan 2019 19:27:45 +0000 Subject: [PATCH 6/8] Signing the CLA (#3734) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index dd489ad1f..26f23e109 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -351,3 +351,5 @@ Johannes Löthberg, @kyrias, 2019/01/07 Ben Webber, @benwebber, 2019/01/09 Jesse Weinstein, @JesseWeinstein, 2019/01/14 + +Adam Sherwood, @admls, 2019/01/27 From c5aa855ce62701968b6028a9d9e5d046987358a0 Mon Sep 17 00:00:00 2001 From: 00SS <38947777+00SS@users.noreply.github.com> Date: Mon, 28 Jan 2019 02:28:42 +0700 Subject: [PATCH 7/8] Docs: add example to CountWidget.tid (#3732) * Update CountWidget.tid Just a simple example added. * Update CountWidget.tid Made a slight addition to conform with the same style used in the Examples section of the $text widget: TextWidget.tid * Update CountWidget.tid Modified to use the Documentation display macro: `<>` --- editions/tw5.com/tiddlers/widgets/CountWidget.tid | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/widgets/CountWidget.tid b/editions/tw5.com/tiddlers/widgets/CountWidget.tid index 9fedcb287..089a3c80a 100644 --- a/editions/tw5.com/tiddlers/widgets/CountWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/CountWidget.tid @@ -1,6 +1,6 @@ title: CountWidget created: 201310241419 -modified: 201310300837 +modified: 20181231131 tags: Widgets caption: count @@ -14,3 +14,6 @@ The content of the `<$count>` widget is ignored. |!Attribute |!Description | |filter |The filter expression to count | + +! Example +< tiddlers tagged with Examples""">> From 90b7961629943a43cd91000ebeb7f9d0cfe589e9 Mon Sep 17 00:00:00 2001 From: 00SS <38947777+00SS@users.noreply.github.com> Date: Mon, 28 Jan 2019 02:29:13 +0700 Subject: [PATCH 8/8] Update TiddlerFields.tid (#3733) #3680 Was getting too complicated for me so opened a new PR --- editions/tw5.com/tiddlers/concepts/TiddlerFields.tid | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid b/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid index 99073f405..3d2dd5a84 100644 --- a/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid +++ b/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid @@ -1,11 +1,11 @@ created: 20130825213300000 -modified: 20160610081054535 +modified: 20180104000000000 tags: Concepts title: TiddlerFields type: text/vnd.tiddlywiki \define lingo-base() $:/language/Docs/Fields/ -TiddlerFields are name:value pairs that make up a [[tiddler|Tiddlers]]. Field names must be lowercase letters, digits or the characters `-` (dash), `_` (underscore) and `.` (period). +~TiddlerFields are name:value pairs that make up a [[tiddler|Tiddlers]]. Field names must be lowercase letters, digits or the characters `-` (dash), `_` (underscore) and `.` (period). The standard fields are: @@ -30,6 +30,7 @@ Other fields used by the core are: |`draft.of` |DraftOfField |<> | |`draft.title` |DraftTitleField |<> | |`footer` |FooterField |<> | +|`hide-body`|HideBodyField|<>| |`icon` |IconField |<> | |`library` |LibraryField |<> | |`list-after` |ListAfterField |<> | @@ -39,6 +40,7 @@ Other fields used by the core are: |`plugin-type` |PluginTypeField |<> | |`source` |SourceField |<> | |`subtitle` |SubtitleField |<> | +|`toc-link`|TocLink|<>| The TiddlyWebAdaptor uses a few more fields: @@ -46,4 +48,4 @@ The TiddlyWebAdaptor uses a few more fields: |`bag` |BagField |<> | |`revision` |RevisionField |<> | -See the ''Advanced > Tiddler Fields'' tab of the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} for details of the fields used in this wiki. +Details of the fields used in this ~TiddlyWiki are shown in the [[control panel|$:/ControlPanel]] {{$:/core/ui/Buttons/control-panel}} under the <<.controlpanel-tab Info>> tab >> <<.info-tab Advanced>> sub-tab >> Tiddler Fields