From 90745f93a51922d83b05920d457bfb449908795f Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 12 Sep 2019 10:33:25 +0100 Subject: [PATCH 01/33] Update safe mode docs Ping @anthonymuscio --- editions/tw5.com/tiddlers/features/SafeMode.tid | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/features/SafeMode.tid b/editions/tw5.com/tiddlers/features/SafeMode.tid index 03fa8f00d..dfe634e23 100644 --- a/editions/tw5.com/tiddlers/features/SafeMode.tid +++ b/editions/tw5.com/tiddlers/features/SafeMode.tid @@ -1,5 +1,5 @@ created: 20140419082845576 -modified: 20160610082458079 +modified: 20190912093109517 tags: Features title: SafeMode type: text/vnd.tiddlywiki @@ -8,6 +8,8 @@ type: text/vnd.tiddlywiki Safe mode provides a way to disabling most customisations in TiddlyWiki. This is useful because if TiddlyWiki is customised incorrectly it can be rendered inoperable. A particular issue is that some customisations break when upgrading to a newer core version of TiddlyWiki (especially during the beta). +<<.warning "Safe mode should only be used with the single file configuration of TiddlyWiki, and then only with savers that do not autosave. Using safe mode in the client server configuration can lead to data loss.">> + ! Enabling Safe Mode Safe mode is enabled in the browser by starting TiddlyWiki with the URL hash set to the string `#:safe`. For example: From 7428f17551b97523aa93b956e3e508230332833d Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Fri, 20 Sep 2019 16:17:55 +0100 Subject: [PATCH 02/33] Docs typo --- .../tw5.com/tiddlers/features/Performance Instrumentation.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/features/Performance Instrumentation.tid b/editions/tw5.com/tiddlers/features/Performance Instrumentation.tid index 702782883..65296c033 100644 --- a/editions/tw5.com/tiddlers/features/Performance Instrumentation.tid +++ b/editions/tw5.com/tiddlers/features/Performance Instrumentation.tid @@ -22,7 +22,7 @@ The information above should be interpreted as follows: As an example, try switching between the sidebar tabs to compare how long they take to render. -More detailed information on filter execution timings is also available. With performance instrumentation enabled, ype the following JavaScript command in the browser developer console: +More detailed information on filter execution timings is also available. With performance instrumentation enabled, type the following JavaScript command in the browser developer console: ``` $tw.perf.log() From 81867a75cd9911104e12103a595637a088f72d22 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Fri, 4 Oct 2019 12:37:04 +0100 Subject: [PATCH 03/33] Add docs for tm-unload-plugin-library message Fixes #4281 --- editions/tw5.com/tiddlers/$__StoryList.tid | 5 +++++ ...WidgetMessage_ tm-unload-plugin-library.tid | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 editions/tw5.com/tiddlers/$__StoryList.tid create mode 100644 editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unload-plugin-library.tid diff --git a/editions/tw5.com/tiddlers/$__StoryList.tid b/editions/tw5.com/tiddlers/$__StoryList.tid new file mode 100644 index 000000000..80d265c4e --- /dev/null +++ b/editions/tw5.com/tiddlers/$__StoryList.tid @@ -0,0 +1,5 @@ +created: 20191004112211823 +list: [[WidgetMessage: tm-unload-plugin-library]] [[WidgetMessage: tm-load-plugin-library]] [[WidgetMessage: tm-load-plugin-from-library]] HelloThere GettingStarted Community +modified: 20191004113621710 +title: $:/StoryList +type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unload-plugin-library.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unload-plugin-library.tid new file mode 100644 index 000000000..f5b9e6ae9 --- /dev/null +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unload-plugin-library.tid @@ -0,0 +1,18 @@ +caption: tm-unload-plugin-library +created: 20191004112527669 +modified: 20191004113621714 +tags: Messages +title: WidgetMessage: tm-unload-plugin-library +type: text/vnd.tiddlywiki + +The `tm-unload-plugin-library` message unloads the specified plugin library and deletes associated temporary tiddlers. + +|!Name |!Description | +|url |Url specifying the plugin library to be unloaded | + +Unloading a plugin library deletes the following tiddlers: + +* The tiddler titled `$:/temp/ServerConnection/` + `` +* All tiddlers with the prefix `$:/temp/RemoteAssetInfo/` + `` + `/` + +The `tm-unload-plugin-library` message is usually generated with the ButtonWidget and is handled by the core itself. From a9cc292dc92716cb03f60de39500ae7fb67ad5b6 Mon Sep 17 00:00:00 2001 From: Matt Lauber Date: Fri, 4 Oct 2019 10:50:00 -0400 Subject: [PATCH 04/33] Add an example to the $fieldmangler widget (#4287) Add an example to the field mangler widget demonstrating the `tiddler` param. --- .../widgets/FieldMangler Widget (Examples).tid | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/editions/tw5.com/tiddlers/widgets/FieldMangler Widget (Examples).tid b/editions/tw5.com/tiddlers/widgets/FieldMangler Widget (Examples).tid index 54c4fb621..9fffb64db 100644 --- a/editions/tw5.com/tiddlers/widgets/FieldMangler Widget (Examples).tid +++ b/editions/tw5.com/tiddlers/widgets/FieldMangler Widget (Examples).tid @@ -12,3 +12,13 @@ Add tag ''example'' to this tiddler (current)<$button message="tm-add-tag" param Remove tag ''example'' to this tiddler (current)<$button message="tm-remove-tag" param="example">{{$:/core/images/delete-button}} """/> + + +<$macrocall $name=".example" n="2" +eg=""" +<$fieldmangler tiddler="Hello World"> +Add tag ''example'' to the Hello World tiddler<$button message="tm-add-tag" param="example">{{$:/core/images/new-button}} +
+Remove tag ''example'' to the Hello World tiddler<$button message="tm-remove-tag" param="example">{{$:/core/images/delete-button}} + +"""/> From 6e57f16517eb392a51c090e736fa01d3c29dbf8d Mon Sep 17 00:00:00 2001 From: Matt Lauber Date: Fri, 4 Oct 2019 10:50:32 -0400 Subject: [PATCH 05/33] Documentation: typo in Range widget documentation (#4288) The documentation for the range widget refers to radio buttons, instead of range sliders. --- editions/tw5.com/tiddlers/widgets/RangeWidget.tid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editions/tw5.com/tiddlers/widgets/RangeWidget.tid b/editions/tw5.com/tiddlers/widgets/RangeWidget.tid index dcb793f29..ddf406ccc 100644 --- a/editions/tw5.com/tiddlers/widgets/RangeWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/RangeWidget.tid @@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki ! Introduction -The range widget displays an HTML `` that reflects a given tiddler field numeric value. Adjusting the radio button sets the tiddler field to the value. +The range widget displays an HTML `` that reflects a given tiddler field numeric value. Adjusting the range slider sets the tiddler field to the value. ! Content and Attributes @@ -15,12 +15,12 @@ The content of the `<$range>` widget is ignored. |!Attribute |!Description | |tiddler |Title of the tiddler to manipulate (defaults to the [[current tiddler|Current Tiddler]]) | -|field |The field of the //tiddler// bound to the radio button| +|field |The field of the //tiddler// bound to the range slider| |min |The minimum value to be able to be set by the `<$range>` widget.| |max |The maximum value to be able to be set by the `<$range>` widget.| |increment |The minimum amount by which a value may be changed. Defaults to 1.| |default |The default value displayed if the field is missing or empty.| -|class |CSS classes to be assigned to the label around the radio button | +|class |CSS classes to be assigned to the label around the range slider | ! Examples From e5985566ce29b4689ae972de93f52b4abcf01ce0 Mon Sep 17 00:00:00 2001 From: donmor Date: Mon, 14 Oct 2019 00:43:46 +0800 Subject: [PATCH 06/33] Update Saving on Android.tid (#4316) --- .../tiddlers/saving/Saving on Android.tid | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/editions/tw5.com/tiddlers/saving/Saving on Android.tid b/editions/tw5.com/tiddlers/saving/Saving on Android.tid index 6be8d5508..7b660198c 100644 --- a/editions/tw5.com/tiddlers/saving/Saving on Android.tid +++ b/editions/tw5.com/tiddlers/saving/Saving on Android.tid @@ -1,26 +1,28 @@ -caption: ~AndTidWiki +caption: Tiddloid and Tiddloid Lite created: 20130825161400000 delivery: App description: Android app for saving changes locally to device storage method: save -modified: 20171113105950965 +modified: 20191013145728306 tags: Saving Android title: Saving on Android type: text/vnd.tiddlywiki -The AndTidWiki app for Android devices makes it possible to edit and save changes to TiddlyWiki5, including working offline without a network connection. [[Download it here|https://play.google.com/store/apps/details?id=de.mgsimon.android.andtidwiki&hl=en]]. +The Tiddloid or Tiddloid Lite app for Android devices makes it possible to edit and save changes to TiddlyWiki. Get it from GitHub: [[Tiddloid|https://github.com/donmor/Tiddloid]] [[Tiddloid Lite|https://github.com/donmor/TiddloidLite]]. -Instructions for use: +''Instructions for use:'' -# [[Download]] an empty TiddlyWiki on another web browser -# Move the file you just downloaded to the directory `/sdcard/andtidwiki` -#* You may rename it, but be sure to keep the `.html` or `.htm` extension -# Open AndTidWiki -#* Don't use ''Menu''/''new ~TiddlyWiki'' menu option (it only supports the older TiddlyWikiClassic) -# Open the file by touching its filename -# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button -#* The wiki will be saved, and a confirmation message should appear at the top right of the window +* ''Creating new Wiki'' +** Open Tiddloid or Toddloid Lite and use ''Toolbar or Menu/New Wiki'' option. Choose a destination file path and a new TiddlyWiki5 document will be created and opened. +* ''Importing existing Wiki'' +** Open Tiddloid or Toddloid Lite and use ''Toolbar or Menu/Import a file'' option. Choose an existing wiki file and it will be imported and opened. +* ''Opening'' +** You can reopen a wiki created or imported above by clicking its title in the app. +* ''Saving'' +** Try making some changes and click the {{$:/core/images/save-button}} ''save changes'' button. The wiki will be saved, and a confirmation message should appear at the top right of the window. +** The wiki will also be saved when clicking the {{$:/core/images/done-button}} ''ok'' button in a tiddler. -''Note:'' You can save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar even if you have not clicked the {{$:/core/images/done-button}} ''ok'' button to complete editing a tiddler +''Note:'' -//Note that AndTidWiki is published independently of TiddlyWiki// \ No newline at end of file +* Tiddloid Lite supports new devices better. It also supports files on clouds like GDrive and ~OneDrive, while Tiddloid keeps the compatibility to TiddlyWikiClassic. For more difference between Tiddloid and Tiddloid Lite, please visit [[Tiddloid's homepage|https://github.com/donmor/Tiddloid]]. +* You should keep the `.html` or `.htm` extension of the files to be imported. From 9e9944b76d9e71ea08d504b864f17ef25f48a6be Mon Sep 17 00:00:00 2001 From: Matt Lauber Date: Thu, 24 Oct 2019 05:02:20 -0400 Subject: [PATCH 07/33] Correct the jsonstringify documentation (#4344) The jsonstringify substitution table does not list all substitutions, and it listed `'` as being replaced when it's not. This updates the table based on the code at https://github.com/Jermolene/TiddlyWiki5/blob/master/core/modules/utils/utils.js#L537 --- .../tw5.com/tiddlers/filters/jsonstringify Operator.tid | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid b/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid index 9031b158f..d9fd288b7 100644 --- a/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid +++ b/editions/tw5.com/tiddlers/filters/jsonstringify Operator.tid @@ -15,10 +15,12 @@ The following substitutions are made: |!Character |!Replacement | |`\` |`\\` | -|`"` |`\\` | -|`'` |`\\` | +|`"` |`\\"` | |`\r` (carriage return) |`\\r` | |`\n` (line feed) |`\\n` | +|`\x08` (backpsace) |`\\b` | +|`\x0c` (formfield) |`\\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 | From 14e799d36b5e5e6908db92e20d7a0b91157c70b1 Mon Sep 17 00:00:00 2001 From: Matt Lauber Date: Thu, 24 Oct 2019 05:03:05 -0400 Subject: [PATCH 08/33] Add discord to forums tiddler. (#4343) --- editions/tw5.com/tiddlers/community/Forums.tid | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/community/Forums.tid b/editions/tw5.com/tiddlers/community/Forums.tid index cd10ffe20..41bbc5210 100644 --- a/editions/tw5.com/tiddlers/community/Forums.tid +++ b/editions/tw5.com/tiddlers/community/Forums.tid @@ -13,7 +13,8 @@ The ~TiddlyWiki discussion groups are mailing lists for talking about ~TiddlyWik ** An enhanced group search facility is available on [[mail-archive.com|https://www.mail-archive.com/tiddlywiki@googlegroups.com/]] * Watch recordings of our regular [[TiddlyWiki Hangouts]] * Follow [[@TiddlyWiki on Twitter|http://twitter.com/TiddlyWiki]] for the latest news -* ''New: Join us on our live chat at https://gitter.im/TiddlyWiki/public !'' +* New: Join us on our live chat at https://gitter.im/TiddlyWiki/public ! +* There is also a discord available at https://discord.gg/HFFZVQ8 ! Developers From df85281420cccc06870e7dce2aafddf2327708a1 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sat, 2 Nov 2019 13:19:00 +0000 Subject: [PATCH 09/33] Improve docs on installing plugins under Node.js --- ...nstalling TiddlyWiki Prerelease on Node.js.tid | 4 ++-- .../Installing custom plugins on Node.js.tid | 15 +++++++++++++++ .../tiddlers/nodejs/TiddlyWiki on Node.js.tid | 6 ++---- ...nstalling a plugin from the plugin library.tid | 6 ++++-- 4 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid diff --git a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid index 827681e21..2b77569b6 100644 --- a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid @@ -1,6 +1,6 @@ created: 20150926162849519 -modified: 20180701185329863 -tags: [[Installing TiddlyWiki on Node.js]] +modified: 20191022095509822 +tags: [[TiddlyWiki on Node.js]] title: Installing TiddlyWiki Prerelease on Node.js type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid new file mode 100644 index 000000000..44e49d772 --- /dev/null +++ b/editions/tw5.com/tiddlers/nodejs/Installing custom plugins on Node.js.tid @@ -0,0 +1,15 @@ +created: 20191022095653896 +modified: 20191102131824766 +tags: [[TiddlyWiki on Node.js]] +title: Installing custom plugins on Node.js +type: text/vnd.tiddlywiki + +There are several ways in which custom plugins that are not part of TiddlyWiki's plugin library can be installed when using TiddlyWiki under Node.js. (See [[Installing a plugin from the plugin library]] for instructions on installing plugins from the library). + +* Arrange the PluginFolders containing the plugins in a convenient shared location and then use [[environment variables|Environment Variables on Node.js]] to tell TiddlyWiki to search those folders. The plugins can be referenced in `tiddlywiki.info` by their name (e.g. `tiddlytools/magic`) +* Place the PluginFolders containing the plugins in a `plugins` folder within the [[wiki folder|TiddlyWikiFolders]] +* Depending on how TiddlyWiki itself has been installed, plugins can also be installed by copying the plugin folders into the `plugins` folder of the repository. This is only recommended if working with a forked copy of the repo. It is not recommended if TiddlyWiki has been installed with npm because npm is liable to overwrite the installation when performing an update + +Note that including a plugin as an ordinary tiddler (e.g. by dragging and dropping a plugin into the browser) will result in the plugin only being active in the browser, and not available under Node.js. + + diff --git a/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid index fe4615a3a..6966debcc 100644 --- a/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid @@ -1,5 +1,5 @@ created: 20131129094353704 -modified: 20150412185457193 +modified: 20191022095309607 tags: Platforms title: TiddlyWiki on Node.js type: text/vnd.tiddlywiki @@ -18,6 +18,4 @@ There are a few file system limitations you should be aware of that are related For more information see: -* [[Installing TiddlyWiki on Node.js]] -* [[Using TiddlyWiki on Node.js]] -* [[Upgrading TiddlyWiki on Node.js]] +<> diff --git a/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid b/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid index 6edc5ad13..baf9bdbe1 100644 --- a/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid +++ b/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid @@ -1,6 +1,6 @@ created: 20160107222352710 -modified: 20160720145836265 -tags: Plugins +modified: 20191022095637710 +tags: [[TiddlyWiki on Node.js]] Plugins title: Installing a plugin from the plugin library type: text/vnd.tiddlywiki @@ -46,3 +46,5 @@ Follow these instructions when using TiddlyWiki under Node.js: ] } ``` + +See also [[Installing custom plugins on Node.js]]. \ No newline at end of file From 337135d1bba4cf3a5975083b0b15fa6d36255d21 Mon Sep 17 00:00:00 2001 From: Xavier Maysonnave Date: Wed, 13 Nov 2019 02:47:45 +0530 Subject: [PATCH 10/33] Signing the CLA (#4367) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 60c397c11..423b2501c 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -373,3 +373,5 @@ Nils-Hero Lindemann, @heronils, 2019/08/26 Mark Stegeman, @markstegeman, 2019/08/31 Jan-Oliver Kaiser, @janno, 2019/09/06 + +Xavier Maysonnave, @xmaysonnave, 2019/11/08 From 7387ca78f892028a159b6ce9d71a5432fb5665ae Mon Sep 17 00:00:00 2001 From: Marica Odagaki Date: Tue, 12 Nov 2019 13:41:46 -0800 Subject: [PATCH 11/33] Sign the CLA as ento (#4222) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 423b2501c..126f9b6af 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -370,6 +370,8 @@ Stefan Schuster-Teupke, @StefanSTFG, 2019/08/26 Nils-Hero Lindemann, @heronils, 2019/08/26 +Marica Odagaki, @ento, 2019/08/30 + Mark Stegeman, @markstegeman, 2019/08/31 Jan-Oliver Kaiser, @janno, 2019/09/06 From e33d519ce0d78974d7cef80521abe63c131927cc Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Mon, 9 Dec 2019 09:05:21 +0000 Subject: [PATCH 12/33] Update docs for "each" filter --- editions/tw5.com/tiddlers/filters/each.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/filters/each.tid b/editions/tw5.com/tiddlers/filters/each.tid index 0216b065d..6bcc88340 100644 --- a/editions/tw5.com/tiddlers/filters/each.tid +++ b/editions/tw5.com/tiddlers/filters/each.tid @@ -1,5 +1,5 @@ created: 20140410103123179 -modified: 20170103175939836 +modified: 20191209085901849 tags: [[Filter Operators]] [[Group Operators]] title: each Operator type: text/vnd.tiddlywiki @@ -20,6 +20,6 @@ Each input title is processed in turn. The value of field <<.place F>> in the co ;each:value :As long as the title is unique it is appended to the output whether or not the corresponding tiddler exists. -If a tiddler does not contain field <<.place F>>, it is treated as if the value of the field were empty. +Note that if a tiddler does not contain field <<.place F>>, it is treated as if the value of the field were empty. Thus, a filter expression such as `[each[color]]` will return one tiddler that doesn't have a `color` field. To obtain just the tiddlers that have a non-blank value for the `color` field one can use `[each[color]has[color]]`. <<.operator-examples "each">> From e3fd14d6e71e247677c6da476ee59aaaa98fbf24 Mon Sep 17 00:00:00 2001 From: Will Atwood Mitchell Date: Thu, 12 Dec 2019 11:45:55 -0500 Subject: [PATCH 13/33] Signing the CLA (#4387) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 126f9b6af..8bb836e60 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -377,3 +377,5 @@ Mark Stegeman, @markstegeman, 2019/08/31 Jan-Oliver Kaiser, @janno, 2019/09/06 Xavier Maysonnave, @xmaysonnave, 2019/11/08 + +Will Atwood Mitchell, @wam, 2019/12/11 From d23545de1f375eac2581d0f3ace4e97c725e8dbb Mon Sep 17 00:00:00 2001 From: Will Atwood Mitchell Date: Thu, 12 Dec 2019 11:48:38 -0500 Subject: [PATCH 14/33] Update links to Json Mangler plugin github pages (#4388) The plugin's repo appears to have been renamed. --- .../resources/Json Mangler plugin by Joshua Fontany.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/community/resources/Json Mangler plugin by Joshua Fontany.tid b/editions/tw5.com/tiddlers/community/resources/Json Mangler plugin by Joshua Fontany.tid index a02972a63..548e0685c 100644 --- a/editions/tw5.com/tiddlers/community/resources/Json Mangler plugin by Joshua Fontany.tid +++ b/editions/tw5.com/tiddlers/community/resources/Json Mangler plugin by Joshua Fontany.tid @@ -7,6 +7,6 @@ Extend tiddlywiki to parse complex ("nested") json data tiddlers. Json Mangler introduces a new path syntax for indexes of json data tiddlers , and includes many supporting tools, filters, widgets, etc. -Example Wiki: https://joshuafontany.github.io/TW5-JsonManglerPlugin/ +Example Wiki: https://joshuafontany.github.io/TW5-JsonMangler/ -Source: https://github.com/joshuafontany/TW5-JsonManglerPlugin \ No newline at end of file +Source: https://github.com/joshuafontany/TW5-JsonMangler From 0671bc5afd252d0043dccfd898ec7ee3a186884a Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 12 Dec 2019 17:39:23 +0000 Subject: [PATCH 15/33] Tweak docs for each filter --- editions/tw5.com/tiddlers/filters/each.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/filters/each.tid b/editions/tw5.com/tiddlers/filters/each.tid index 6bcc88340..c6140b791 100644 --- a/editions/tw5.com/tiddlers/filters/each.tid +++ b/editions/tw5.com/tiddlers/filters/each.tid @@ -20,6 +20,6 @@ Each input title is processed in turn. The value of field <<.place F>> in the co ;each:value :As long as the title is unique it is appended to the output whether or not the corresponding tiddler exists. -Note that if a tiddler does not contain field <<.place F>>, it is treated as if the value of the field were empty. Thus, a filter expression such as `[each[color]]` will return one tiddler that doesn't have a `color` field. To obtain just the tiddlers that have a non-blank value for the `color` field one can use `[each[color]has[color]]`. +Note that if a tiddler does not contain field <<.place F>>, it is treated as if the value of the field were empty. Thus, a filter expression such as `[each[motovun]]` will return one tiddler that doesn't have a `motovun` field, as well as one tiddler with each distinct value of that field, if any. To obtain just the tiddlers that have a non-blank value for the `motovun` field one can use `[each[motovun]has[motovun]]`. <<.operator-examples "each">> From 55ed290e18d6abd3bb64efb3b4db2346cb11c214 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 12 Dec 2019 18:02:21 +0000 Subject: [PATCH 16/33] Fix tests in tiddlywiki-com branch by forcing an older version of node.js --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d7f1a5566..35c645056 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: node_js - - "node" + - "8" stages: - name: test From 28b91613019d9470eecd2c0a6d847922ab32fac9 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 12 Dec 2019 18:05:31 +0000 Subject: [PATCH 17/33] Another attempt to force Travis to use an old Node.js Another attempt at 55ed290e1 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 35c645056..2de1ce8a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: node_js +node_js: - "8" stages: From 429d38e75da0c2816771266a06e33efc535d160d Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sat, 4 Jan 2020 11:20:17 +0000 Subject: [PATCH 18/33] Update TiddlyFox docs Fixes #4399 --- editions/tw5.com/tiddlers/definitions/TiddlyFox.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid b/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid index e96057783..83fa3c444 100644 --- a/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid +++ b/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid @@ -1,12 +1,12 @@ created: 20130825161100000 -modified: 20171110094548887 +modified: 20200104111952539 tags: Definitions title: TiddlyFox type: text/vnd.tiddlywiki TiddlyFox is an extension for older versions of Firefox that allows standalone TiddlyWiki files to save their changes directly to the file system. TiddlyFox works on both desktop and smartphone versions of [[Firefox]]. See [[Saving with TiddlyFox]] or [[Saving with TiddlyFox on Android]] for detailed instructions. -TiddlyFox is now obsolete due to its incompatibility with the latest versions of Firefox - see [[Firefox Apocalypse]]. There are many alternatives to TiddlyFox, but none that work in precisely the same way -- see GettingStarted for details. +TiddlyFox is now obsolete due to its incompatibility with the latest versions of Firefox - see [[TiddlyFox Apocalypse]]. There are many alternatives to TiddlyFox, but none that work in precisely the same way -- see GettingStarted for details. TiddlyFox can be downloaded from the Mozilla Addons site: From 9c1882dce6720c8abe822361945dcae93655f930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Kr=C3=BCger?= Date: Sat, 4 Jan 2020 12:26:08 +0100 Subject: [PATCH 19/33] Signing the CLA (#4403) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 8bb836e60..bf375697f 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -379,3 +379,5 @@ Jan-Oliver Kaiser, @janno, 2019/09/06 Xavier Maysonnave, @xmaysonnave, 2019/11/08 Will Atwood Mitchell, @wam, 2019/12/11 + +Stefan Krüger, @s-light, 2020/01/04 From 8145caa10428bd6e23d7abb389d7845731133ebb Mon Sep 17 00:00:00 2001 From: TonyM <31584658+AnthonyMuscio@users.noreply.github.com> Date: Wed, 15 Jan 2020 02:55:53 +1000 Subject: [PATCH 20/33] Add a new example that shows using all before to determine the nummeric position of a title in a list. (#4412) See discussion https://groups.google.com/forum/?hl=en#!topic/tiddlywiki/wY6haW2cYMA --- editions/tw5.com/tiddlers/filters/examples/allbefore.tid | 1 + 1 file changed, 1 insertion(+) diff --git a/editions/tw5.com/tiddlers/filters/examples/allbefore.tid b/editions/tw5.com/tiddlers/filters/examples/allbefore.tid index 01313dbec..92fc9f914 100644 --- a/editions/tw5.com/tiddlers/filters/examples/allbefore.tid +++ b/editions/tw5.com/tiddlers/filters/examples/allbefore.tid @@ -8,3 +8,4 @@ type: text/vnd.tiddlywiki <<.operator-example 1 "[list[Days of the Week]allbefore[Wednesday]]">> <<.operator-example 2 "[list[Days of the Week]allbefore:include[Wednesday]]">> +<<.operator-example 3 "A B C D E +[allbefore:include[C]count[]]">> From 35178f41b0fac6384b294b0d13462b988376f85a Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 29 Jan 2020 18:14:02 +0100 Subject: [PATCH 21/33] Docs: Update length Operator.tid (#4428) --- editions/tw5.com/tiddlers/filters/length Operator.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/filters/length Operator.tid b/editions/tw5.com/tiddlers/filters/length Operator.tid index d9cd66b85..c5c034e90 100644 --- a/editions/tw5.com/tiddlers/filters/length Operator.tid +++ b/editions/tw5.com/tiddlers/filters/length Operator.tid @@ -3,7 +3,7 @@ created: 20190613153225735 modified: 20190613153321546 op-input: a [[selection of titles|Title Selection]] op-output: replaces each input title with its length as an integer -op-purpose: returns the lengths of each item in the list +op-purpose: returns the number of characters of each item in the list tags: [[Filter Operators]] title: length Operator type: text/vnd.tiddlywiki From cead051c73a1783714bcc3375ab75010c087921c Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 29 Jan 2020 18:18:33 +0100 Subject: [PATCH 22/33] Docs: Update sign Operator.tid (#4426) --- editions/tw5.com/tiddlers/filters/sign Operator.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/filters/sign Operator.tid b/editions/tw5.com/tiddlers/filters/sign Operator.tid index e25783f92..f44a21b59 100644 --- a/editions/tw5.com/tiddlers/filters/sign Operator.tid +++ b/editions/tw5.com/tiddlers/filters/sign Operator.tid @@ -2,8 +2,8 @@ caption: sign created: 20190613084919354 modified: 20190613085044655 op-input: a [[selection of titles|Title Selection]] -op-output: replaces each input number with -1, 0 or +1 according to whether the number is negative, zero, or positive -op-purpose: return -1, 0 or +1 for a list of numbers according to whether each number is negative, zero, or positive +op-output: replaces each input number with -1, 0 or 1 according to whether the number is negative, zero, or positive +op-purpose: return -1, 0 or 1 for a list of numbers according to whether each number is negative, zero, or positive tags: [[Unary Mathematics Operators]] [[Filter Operators]] [[Mathematics Operators]] title: sign Operator type: text/vnd.tiddlywiki From ba10b4fb0071aee24168cfaa95b86058b2654123 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Thu, 30 Jan 2020 13:50:19 +0100 Subject: [PATCH 23/33] Docs: bring tm-fold-xxx message docs on par with the code, that is executed. (#4353) --- .../WidgetMessage_ tm-fold-all-tiddlers.tid | 2 +- .../WidgetMessage_ tm-fold-other-tiddlers.tid | 6 +++--- .../WidgetMessage_ tm-fold-tiddler.tid | 18 +++++++++++++----- .../WidgetMessage_ tm-unfold-all-tiddlers.tid | 8 ++++---- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-all-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-all-tiddlers.tid index bb2d4a576..d29183a0a 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-all-tiddlers.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-all-tiddlers.tid @@ -1,6 +1,6 @@ caption: tm-fold-all-tiddlers created: 20160424230908388 -modified: 20190205154007291 +modified: 20191028113838596 tags: Messages title: WidgetMessage: tm-fold-all-tiddlers type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-other-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-other-tiddlers.tid index 09fd8a751..af5a3b4eb 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-other-tiddlers.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-other-tiddlers.tid @@ -1,6 +1,6 @@ caption: tm-fold-other-tiddlers created: 20160424232355215 -modified: 20160424233338710 +modified: 20191028113932268 tags: Messages title: WidgetMessage: tm-fold-other-tiddlers type: text/vnd.tiddlywiki @@ -11,8 +11,8 @@ The `tm-fold-other-tiddlers` message folds all tiddlers in the current story lis |param|Title of the tiddler that should be ignored by the fold operation. | |foldedStatePrefix |Prefix for the state tiddler in which the fold state is stored. | -<<.tip "The core uses a foldStatePrefix of '$:/state/folded/' to store the fold states for the default story view.">> -<<.warning "The state tiddlers title is computed as 'foldStatePrefix + TiddlerTitle'. If the foldStatePrefix is not set, it will overwrite the text of the tiddler(s) itself, resulting in data loss. ">> +<<.tip "The core uses a foldStatePrefix of `$:/state/folded/` to store the fold states for the default story view.">> +<<.warning "The state tiddlers title is computed as `foldStatePrefix + TiddlerTitle`. If the foldStatePrefix is not set, it will overwrite the text of the tiddler(s) itself, resulting in data loss. ">> The `tm-fold-other-tiddlers` message is usually generated with the ButtonWidget and is handled by the surrounding NavigatorWidget. diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-tiddler.tid index 872272128..6d6eee517 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-tiddler.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-tiddler.tid @@ -1,16 +1,24 @@ caption: tm-fold-tiddler created: 20160424232749223 -modified: 20160424233102003 +modified: 20191028113537119 tags: Messages title: WidgetMessage: tm-fold-tiddler type: text/vnd.tiddlywiki -The `tm-fold-tiddler` message folds the tiddler specified in the `param` parameter. It does so by setting the text of a state tiddler to either "<<.value "show">>" or "<<.value "hide">>", according to the fold state. +The `tm-fold-tiddler` message toggles the value of a state tiddler. It does so by setting the text of a state tiddler to either "<<.value "show">>" or "<<.value "hide">>", according to the fold state. |!Name |!Description | -|param|Title of the tiddler that should be folded. If the tiddler is already folded, it will be unfolded instead. | -|foldedStatePrefix |Prefix for the state tiddler in which the fold state is stored. If no state prefix is provided, `tm-fold-tiddler` will do nothing. | +|param |ignored ... foldedState must be used | +|foldedState |State tiddler in which the fold state is stored | -<<.tip "The core uses a foldStatePrefix of '$:/state/folded/' to store the fold states for the default story view.">> +<<.tip "The core uses a foldState prefix of `$:/state/folded/` + `tiddler title` to store the fold states for the default story view.">> The `tm-fold-tiddler` message is usually generated with the ButtonWidget and is handled by the surrounding NavigatorWidget. + +The core $:/core/ui/ViewTemplate defines a global variable `folded-state`, that is used with every tiddler. It's created like this: + +``` +\define folded-state() +$:/state/folded/$(currentTiddler)$ +\end +``` diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unfold-all-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unfold-all-tiddlers.tid index 906d8fabe..db324699e 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unfold-all-tiddlers.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unfold-all-tiddlers.tid @@ -1,16 +1,16 @@ caption: tm-unfold-all-tiddlers created: 20160424233133261 -modified: 20160424233427308 +modified: 20191028113810219 tags: Messages title: WidgetMessage: tm-unfold-all-tiddlers type: text/vnd.tiddlywiki -The `tm-unfold-all-tiddlers` message unfolds all tiddlers in the current story list. It does so by setting the text of a state tiddler to either "<<.value "show">>" or "<<.value "hide">>", according to the fold state. +The `tm-unfold-all-tiddlers` message unfolds all tiddlers in the current story list. It does so by setting the text of all state tiddlers to: "<<.value "show">>". |!Name |!Description | |foldedStatePrefix |Prefix for the state tiddler in which the fold state is stored. | -<<.tip "The core uses a foldStatePrefix of '$:/state/folded/' to store the fold states for the default story view.">> -<<.warning "The state tiddlers title is computed as 'foldStatePrefix + TiddlerTitle'. If the foldStatePrefix is not set, it will overwrite the text of the tiddler(s) itself, resulting in data loss. ">> +<<.tip "The core uses a foldStatePrefix of `$:/state/folded/` to store the fold states for the default story view.">> +<<.warning "The state tiddlers title is computed as `foldStatePrefix + TiddlerTitle`. If the foldStatePrefix is not set, it will overwrite the text of the tiddler(s) itself, resulting in data loss. ">> The `tm-unfold-all-tiddlers` message is usually generated with the ButtonWidget and is handled by the surrounding NavigatorWidget. From 5bfc66b8e35a07815d1d2a30aaa1d81e484614a3 Mon Sep 17 00:00:00 2001 From: Lee Sheng Long Date: Fri, 31 Jan 2020 03:18:09 +1100 Subject: [PATCH 24/33] Signing the CLA (#4424) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index bf375697f..a68b8c1e5 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -381,3 +381,5 @@ Xavier Maysonnave, @xmaysonnave, 2019/11/08 Will Atwood Mitchell, @wam, 2019/12/11 Stefan Krüger, @s-light, 2020/01/04 + +Lee Sheng Long, @s-l-lee, 2020/01/25 From b454e809f35679ff3547ea5c45f2bf44c7bf0661 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Fri, 31 Jan 2020 17:15:09 +0000 Subject: [PATCH 25/33] Docs: Fix typos in button widget docs --- .../tw5.com/tiddlers/widgets/ButtonWidget.tid | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid index a2052295e..7c3166a3d 100644 --- a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid @@ -1,6 +1,6 @@ caption: button created: 20131024141900000 -modified: 20170406085706139 +modified: 20200131171028279 tags: Widgets title: ButtonWidget type: text/vnd.tiddlywiki @@ -30,11 +30,11 @@ The content of the `<$button>` widget is displayed within the button. |param |The optional parameter to the message | |set |A TextReference to which a new value will be assigned | |setTitle |A title to which a new value will be assigned, ''without'' TextReference. Gets preferred over <<.attr state>> | -|setField |A ''field name'' to which the new value will be assigned, if the attribute <<.attr stateTitle>> is present. Defaults to the ''text'' field | -|setIndex |An ''index'' to which the new value will be assigned, if the attribute <<.attr stateTitle>> is present | -|setTo |The new value to assign to the TextReference identified in the `set` attribute or the text field / the field specified through `setField` / the index specified through `setIndex` of the title given through `setTitle` | -|selectedClass |An optional additional CSS class to be assigned if the popup is triggered or the tiddler specified in `set` already has the value specified in `setTo` | -|default |Default value if `set` tiddler is missing for testing against `setTo` to determine `selectedClass` | +|setField |A ''field name'' to which the new value will be assigned, if the attribute <<.attr setTitle>> is present. Defaults to the ''text'' field | +|setIndex |An ''index'' to which the new value will be assigned, if the attribute <<.attr setTitle>> is present | +|setTo |The new value to assign to the TextReference identified in the `set` attribute or the text field / the field specified through <<.attr setField>> / the index specified through <<.attr setIndex>> of the title given through <<.attr setTitle>> | +|selectedClass |An optional additional CSS class to be assigned if the popup is triggered or the tiddler specified in <<.attr set>> already has the value specified in <<.attr setTo>> | +|default |Default value if <<.attr set>> tiddler is missing for testing against <<.attr setTo>> to determine <<.attr selectedClass>> | |popup |Title of a state tiddler for a popup that is toggled when the button is clicked. See PopupMechanism for details | |popupTitle |Title of a state tiddler for a popup that is toggled when the button is clicked. In difference to the <<.attr popup>> attribute, ''no'' TextReference is used. See PopupMechanism for details | |aria-label |Optional [[Accessibility]] label | @@ -45,9 +45,9 @@ The content of the `<$button>` widget is displayed within the button. |dragTiddler |An optional tiddler title making the button draggable and identifying the payload tiddler. See DraggableWidget for details | |dragFilter |An optional filter making the button draggable and identifying the list of payload tiddlers. See DraggableWidget for details | -''Note:'' In almost all other cases where a TextReference is used as a widget attribute, it will be placed between curly brackets, to [[transclude|Transclusion in WikiText]] the value currently stored there. However, when we use a TextReference as the value of a button widget's `set` attribute, we are referencing //the storage location itself//, rather than the value stored there, so we do ''not'' use curly brackets there. //Example:// we could code a button widget that sets the `caption` field of TiddlerA to be the same as that of TiddlerB as: +''Note:'' In almost all other cases where a TextReference is used as a widget attribute, it will be placed between curly brackets, to [[transclude|Transclusion in WikiText]] the value currently stored there. However, when we use a TextReference as the value of a button widget's <<.attr set>> attribute, we are referencing //the storage location itself//, rather than the value stored there, so we do ''not'' use curly brackets there. //Example:// we could code a button widget that sets the `caption` field of TiddlerA to be the same as that of TiddlerB as: -<<.tip """<$macrocall $name=".from-version" version="5.1.18"/> <$macrocall $name=".attr" _="stateTitle"/>, <$macrocall $name=".attr" _="stateField"/> and <$macrocall $name=".attr" _="stateIndex"/> attributes allow specifying Tiddler states ''directly'', without interpreting them as [[TextReferences|TextReference]]. +<<.tip """<$macrocall $name=".from-version" version="5.1.18"/> <$macrocall $name=".attr" _="setTitle"/>, <$macrocall $name=".attr" _="setField"/> and <$macrocall $name=".attr" _="setIndex"/> attributes allow specifying Tiddler states ''directly'', without interpreting them as [[TextReferences|TextReference]]. This is useful for edge-cases where titles may contain characters that are used to denote Tiddler fields or indices (`!!`, `##`)""">> ``` From 9d2eff61ca0e93c4d5250c3fcddaa84cf4594296 Mon Sep 17 00:00:00 2001 From: twMat Date: Sat, 1 Feb 2020 14:41:43 +0100 Subject: [PATCH 26/33] Docs: Update ViewWidget.tid (#4437) --- editions/tw5.com/tiddlers/widgets/ViewWidget.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid index 6702c2e15..bba220247 100644 --- a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid @@ -27,7 +27,7 @@ The content of the `<$view>` widget is displayed if the field or property is mis The following formats can be specified in the `format` attribute: |!Format |!Description | -|''text'' |Plain text | +|''text'' |Plain text (default) | |''htmlencoded'' |The field is displayed with HTML encoding | |''urlencoded'' |The field is displayed with URL encoding | |''doubleurlencoded'' |The field is displayed with double URL encoding | From 0b1887e677a9e881d03a493d2edc398f53a58a70 Mon Sep 17 00:00:00 2001 From: lucible <45129600+lucible@users.noreply.github.com> Date: Wed, 5 Feb 2020 15:44:55 -0600 Subject: [PATCH 27/33] Signing the CLA (#4447) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index a68b8c1e5..f5cc01e4f 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -383,3 +383,5 @@ Will Atwood Mitchell, @wam, 2019/12/11 Stefan Krüger, @s-light, 2020/01/04 Lee Sheng Long, @s-l-lee, 2020/01/25 + +@lucible, 2020/02/05 From a942b161addc57fbabec7dac57070f2860346b72 Mon Sep 17 00:00:00 2001 From: scott willeke Date: Mon, 2 Mar 2020 01:27:55 -0800 Subject: [PATCH 28/33] Signing the CLA (#4440) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index f5cc01e4f..25cc8c2ac 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -384,4 +384,6 @@ Stefan Krüger, @s-light, 2020/01/04 Lee Sheng Long, @s-l-lee, 2020/01/25 +Scott Willeke, @activescott, 2020/02/01 + @lucible, 2020/02/05 From d950591051dcf91f13f73e2464ecb144c0268484 Mon Sep 17 00:00:00 2001 From: JesseWeinstein Date: Mon, 9 Mar 2020 14:34:23 -0700 Subject: [PATCH 29/33] Mention importing process more explicitly (#3666) * Mention importing process more explicitly * Explicitly mention "images" So this page shows up in a search for "images". * Apply PR suggestions --- editions/tw5.com/tiddlers/features/Importing Tiddlers.tid | 6 +++--- editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid b/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid index a03082a9f..eef00a5e2 100644 --- a/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid +++ b/editions/tw5.com/tiddlers/features/Importing Tiddlers.tid @@ -8,10 +8,10 @@ You can import tiddlers into a ~TiddlyWiki from external files or directly from !! Importing content from external files -There are several ways to import content from external files: +There are several ways to import content (including text, images, pdf documents, etc.) from external files: -* Use the {{$:/core/images/import-button}} ''import'' button (under the ''Tools'' tab in the sidebar) to select a local file -* Drag and drop files from Windows Explorer or OS X Finder etc. into the TiddlyWiki browser window +* Use the <<.button import>> button (under the <<.sidebar-tab Tools>> tab in the sidebar) to select a local file +* Drag and drop files from Windows Explorer or OS X Finder etc. into the ~TiddlyWiki browser window * Paste content directly from the clipboard using the menu or keyboard shortcut (ctrl-V or cmd-V) ** Currently supported in Chrome, Firefox and Edge (but not Internet Explorer) diff --git a/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid index 1bb31e7ad..6dd358f1a 100644 --- a/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid @@ -51,3 +51,7 @@ Renders as: {{Motovun Jack.jpg}} +! Importing Images + +Use the <<.button import>> button (under the <<.sidebar-tab Tools>> tab in the sidebar), or drag and drop. +See [[ImportingTiddlers]] for details. From cab9fd11dc89e0a322385009bd60cc1dbf5d42c2 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Wed, 11 Mar 2020 17:19:21 +0000 Subject: [PATCH 30/33] Clarify docs on the path-prefix subcommand of the listen command --- .../tiddlers/webserver/WebServer Parameter_ path-prefix.tid | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/webserver/WebServer Parameter_ path-prefix.tid b/editions/tw5.com/tiddlers/webserver/WebServer Parameter_ path-prefix.tid index ed929c406..9cd2483e7 100644 --- a/editions/tw5.com/tiddlers/webserver/WebServer Parameter_ path-prefix.tid +++ b/editions/tw5.com/tiddlers/webserver/WebServer Parameter_ path-prefix.tid @@ -1,6 +1,6 @@ caption: path-prefix created: 20180630180514893 -modified: 20180702154716090 +modified: 20200311171847360 tags: [[WebServer Parameters]] title: WebServer Parameter: path-prefix type: text/vnd.tiddlywiki @@ -12,3 +12,5 @@ This example causes the server to serve from http://127.0.0.1/MyApp instead of t ``` tiddlywiki mywikifolder --listen "path-prefix=/MyApp" ``` + +Note that further steps are required to configure the client-side components to use the prefix. See [[Using a custom path prefix with the client-server edition]]. \ No newline at end of file From 2ad8d1790b8343060770b1ab21c39451ac338200 Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 11 Mar 2020 18:37:53 +0100 Subject: [PATCH 31/33] Update LinkWidget.tid (#4489) --- editions/tw5.com/tiddlers/widgets/LinkWidget.tid | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid index bebebef6a..e7dfef3de 100644 --- a/editions/tw5.com/tiddlers/widgets/LinkWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/LinkWidget.tid @@ -9,9 +9,10 @@ The `link` widget generates links to tiddlers. (Use the HTML `` element to ge ! Content and Attributes -The content of the link widget is rendered within the `` tag representing the link. If the content is empty then the title of the target tiddler is rendered as the default. +The content of the link widget is rendered within the `` tag representing the link. If the content is empty then the title of the target tiddler is rendered as the default, for example: -For example, `<$link to="HelloThere"/>` is equivalent to `<$link to="HelloThere">HelloThere` and `<$link/>` is equivalent to `<$link to=<>><$view field="title"/>`. +* `<$link/>` is equivalent to `<$link to=<>><$view field="title"/>` +* `<$link to="HelloThere"/>` is equivalent to `<$link to="HelloThere">HelloThere` |!Attribute |!Description | |to |The title of the target tiddler for the link (defaults to the [[current tiddler|Current Tiddler]]) | From d7045070699571a1b35bfffd9bd686c25e696d7a Mon Sep 17 00:00:00 2001 From: Matthias Bilger Date: Thu, 12 Mar 2020 16:42:15 +0100 Subject: [PATCH 32/33] Signing the CLA (#4492) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 25cc8c2ac..2bfa76cc7 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -387,3 +387,5 @@ Lee Sheng Long, @s-l-lee, 2020/01/25 Scott Willeke, @activescott, 2020/02/01 @lucible, 2020/02/05 + +Matthias Bilger, @m42e, 2020/03/11 From c16c2fe5e67cb10d4b0a2834899149c13232485a Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Wed, 18 Mar 2020 11:57:58 +0000 Subject: [PATCH 33/33] Docs: Clarify Node.js docs --- .../tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid index 6966debcc..3175791e9 100644 --- a/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid +++ b/editions/tw5.com/tiddlers/nodejs/TiddlyWiki on Node.js.tid @@ -1,5 +1,5 @@ created: 20131129094353704 -modified: 20191022095309607 +modified: 20200318115527226 tags: Platforms title: TiddlyWiki on Node.js type: text/vnd.tiddlywiki @@ -10,11 +10,7 @@ Running TiddlyWiki on [[Node.js]] brings several important benefits over and abo * Individual tiddlers are stored in separate files, which you can organise as you wish * The ability to build multiple wikis that blend different combinations of shared and unique content -There are a few file system limitations you should be aware of that are related to how TiddlyWiki was designed: - -* The best, most general way to interact with a running wiki is via the HTTP or JavaScript API, rather than manipulating the file store directly -* Any modification to the contents of the wiki folder (e.g. images) might thus sometimes require that your restart the node.js server -* TiddlyWiki might support manipulating the file store directly in the future +<<.warning """Note that TiddlyWiki on Node.js doesn't currently support directly modifying the tiddler files via the file system while it is running. The server must be restarted in order to for changes to take effect. The recommended way to interact with a running wiki is via the HTTP or JavaScript APIs.""">> For more information see: