From 496610aa490a5dc33613b9117faf1499d1af3777 Mon Sep 17 00:00:00 2001 From: donmor Date: Thu, 30 May 2019 16:42:57 +0800 Subject: [PATCH 01/12] Signing the CLA for @donmor (#3957) --- licenses/cla-individual.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index cf8c61298..fb9a592a9 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -354,4 +354,6 @@ Jesse Weinstein, @JesseWeinstein, 2019/01/14 Adam Sherwood, @admls, 2019/01/27 -Joshua Fontany, @joshuafontany, 2019/03/07 \ No newline at end of file +Joshua Fontany, @joshuafontany, 2019/03/07 + +Dong Zhihong, @donmor, 2019/05/29 From 6c08fec2ee814715610fb7f2533b27d3f71a3d77 Mon Sep 17 00:00:00 2001 From: twMat Date: Fri, 31 May 2019 17:05:35 +0200 Subject: [PATCH 02/12] Update Saving on TiddlySpot.tid (#3960) Included mention of community created (i.e created by me) "shortcut" to set up new TW5 on TS. --- .../tiddlers/saving/Saving on TiddlySpot.tid | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid index 607ae87ae..af1ce8957 100644 --- a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid +++ b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid @@ -8,9 +8,17 @@ method: save caption: TiddlySpot description: Free online service for hosting TiddlyWiki files -TiddlySpot is a free hosting service for TiddlyWiki documents from Simon and Daniel Baird. The easiest way to get started is to sign up for a new wiki at http://tiddlyspot.com - by default you'll get the latest release of TiddlyWiki Classic. +[[TiddlySpot|http://tiddlyspot.com]] is a free hosting service for TiddlyWiki documents from Simon Baird and Daniel Baird. -You can upload an existing TiddlyWiki5 document from your local disc to TiddlySpot by following these steps: +! Setting up a TiddlyWiki on TiddlySpot +To set up a [[TiddlyWiki Classic|TiddlyWikiClassic]], you merely create a new wiki at http://tiddlyspot.com + +!!TiddlyWiki5 on TiddlySpot +~TiddlyWiki5 also functions well on ~TiddlySpot but this version is not offered directly in the TiddlySpot set-up. + +The simplest way to create a new ~TiddlySpot with ~TiddlyWiki5 is probably through the community created site http://tiddlywiki5.tiddlyspot.com + +Alternatively, you can upload an existing ~TiddlyWiki5 document from your local disc to ~TiddlySpot by following these steps: # Sign up for a new wiki at http://tiddlyspot.com/, and remember the wiki name and password # Open your locally stored TiddlyWiki document in your browser @@ -43,4 +51,4 @@ The upgrade operation falls foul of a security restriction in Firefox. Until thi * After you've uploaded your local document once, further editing and saving of the online version hosted on TiddlySpot should work with any modern browser of your choice. ** Don't forget to fill in the TiddlySpot wikiname and password in your TiddlySpot TiddlyWiki control panel for any new browser you want to use for saving changes -* //See also : [[Upgrading]]// \ No newline at end of file +* //See also : [[Upgrading]]// From 736ac9052d3f67ef042799e0ada7840abe9d5290 Mon Sep 17 00:00:00 2001 From: LordRatte Date: Fri, 31 May 2019 19:11:17 +0200 Subject: [PATCH 03/12] Update TiddlyDrive info on Tiddlywiki.com (#3961) * Update TiddlyDrive info * Accept Licence --- .../TiddlyDrive Add-on for Google Drive by Joshua Stubbs.tid | 5 +++-- licenses/cla-individual.md | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyDrive Add-on for Google Drive by Joshua Stubbs.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyDrive Add-on for Google Drive by Joshua Stubbs.tid index 211ed4519..5fee9c4cf 100644 --- a/editions/tw5.com/tiddlers/community/resources/TiddlyDrive Add-on for Google Drive by Joshua Stubbs.tid +++ b/editions/tw5.com/tiddlers/community/resources/TiddlyDrive Add-on for Google Drive by Joshua Stubbs.tid @@ -3,14 +3,15 @@ created: 20171109172705241 delivery: Google Drive Add-on description: Google Drive add-on to save TiddlyWiki files method: save -modified: 20171113134317867 +modified: 20190531161707260 tags: Saving plugins Resources Android Chrome Firefox InternetExplorer iOS Linux Mac Opera PHP Safari Windows title: TiddlyDrive Add-on for Google Drive by Joshua Stubbs type: text/vnd.tiddlywiki -url: https://chrome.google.com/webstore/detail/tiddly-drive/oaphhjhbbabdjnpjpiliepphpmnioolo +url: https://lordratte.gitlab.io/tiddlydrive/#installation-guide An add-on for Google Drive that allows TiddlyWiki files stored there to be opened and saved directly +To find out how to add it to your account, go to the project's info page: {{!!url}} <<< diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index fb9a592a9..90dd309e0 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -357,3 +357,5 @@ Adam Sherwood, @admls, 2019/01/27 Joshua Fontany, @joshuafontany, 2019/03/07 Dong Zhihong, @donmor, 2019/05/29 + +Joshua Stubbs, @LordRatte, 2019/05/31 From 1e8a56768f502f4598a6429f22f57ebaa63a23c5 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sat, 8 Jun 2019 17:34:06 +0100 Subject: [PATCH 04/12] Update ListWidget docs Fixes #3964 --- editions/tw5.com/tiddlers/widgets/ListWidget.tid | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid index 12a4b6577..272df8d87 100644 --- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid @@ -1,6 +1,6 @@ caption: list created: 20131024141900000 -modified: 20181013230425882 +modified: 20190608162410684 tags: Widgets Lists title: ListWidget type: text/vnd.tiddlywiki @@ -68,7 +68,14 @@ See GroupedLists for how to generate nested and grouped lists using the ListWidg ! Content and Attributes -The content of the `<$list>` widget is an optional template to use for rendering each tiddler in the list. Alternatively, the template can be specified as a tiddler title in the ``template`` attribute. As a fallback, the default template just displays the tiddler title. +The content of the `<$list>` widget is an optional template to use for rendering each tiddler in the list. + +The action of the list widget depends on the results of the filter combined with several options for specifying the template: + +* If the filter evaluates to an empty list, the text of the ''emptyMessage'' attribute is rendered, and all other templates are ignored +* Otherwise, if the ''template'' attribute is specified then it is taken as the title of a tiddler to use as a template for rendering each item of the list +* Otherwise, if the list widget content is not blank, it is used as a template for rendering each item of the list +* Otherwise, a default template is used consisting of a `` or `
` element wrapped around a link to the item |!Attribute |!Description | |filter |The [[tiddler filter|Filters]] to display | From 1a08430a0c63c958f35728fffa580205f22b2be4 Mon Sep 17 00:00:00 2001 From: twMat Date: Wed, 12 Jun 2019 23:03:01 +0200 Subject: [PATCH 05/12] Docs: Fix typo in TextReference.tid (#3978) minor correction - or am I mistaken? --- editions/tw5.com/tiddlers/concepts/TextReference.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/concepts/TextReference.tid b/editions/tw5.com/tiddlers/concepts/TextReference.tid index 4b9a9d2f7..474149b88 100644 --- a/editions/tw5.com/tiddlers/concepts/TextReference.tid +++ b/editions/tw5.com/tiddlers/concepts/TextReference.tid @@ -18,7 +18,7 @@ A TextReference consists of several parts: Most of the parts of a text reference can be optional: -* `tiddlerTitle` - the text [[field|TiddlerFields]] of the specified tiddler +* `tiddlerTitle` - the title [[field|TiddlerFields]] of the specified tiddler * `tiddlerTitle!!field` - a [[tiddler field|TiddlerFields]] (eg, `modified`, `modifier`, `type` etc) * `!!field` - a [[field|TiddlerFields]] of the current tiddler * `tiddlerTitle##propertyIndex` - extracts a named property from DataTiddlers From a4dcc20797ff242129f24c44c48b7a5c57de7af5 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Mon, 17 Jun 2019 12:31:54 -0500 Subject: [PATCH 06/12] Signing the CLA as rmunn (#3992) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 90dd309e0..8677707d9 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -359,3 +359,5 @@ Joshua Fontany, @joshuafontany, 2019/03/07 Dong Zhihong, @donmor, 2019/05/29 Joshua Stubbs, @LordRatte, 2019/05/31 + +Robin Munn, @rmunn, 2019/06/16 From 6fd70f9c11a15981f4d8586c49f7533331f5872c Mon Sep 17 00:00:00 2001 From: twMat Date: Tue, 18 Jun 2019 11:49:52 +0200 Subject: [PATCH 07/12] Docs: Update CheckBox example (#3996) --- editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid index 60f1b389b..ec6e2162f 100644 --- a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid @@ -63,7 +63,7 @@ It is often necessary to use triple quotes with the `actions` attribute. Alterna <$macrocall $name='wikitext-example-without-html' src='<$fieldmangler> <$set filter="[[Features]] [[Encryption]] +[tags[]]" name="tag"> -<$checkbox actions="""<$action-setfield $field="tags" $value=<> /><$action-sendmessage $message="tm-add-tag" $param=<> />""" field="checked" checked="YES" unchecked="NO" > +<$checkbox actions="""<$action-setfield $field="tags" $value=<> ><$action-sendmessage $message="tm-add-tag" $param=<> />""" field="checked" checked="YES" unchecked="NO" > Add tags from tiddlers [[Features]] and [[Encryption]] From d8b79723cd3f3ecbdc307a39ade6dbebae2b3cb9 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Wed, 19 Jun 2019 15:56:07 +0100 Subject: [PATCH 08/12] Docs: Remove broken example of checkbox actions attribute See https://github.com/Jermolene/TiddlyWiki5/pull/3996#issuecomment-503596160 --- .../tw5.com/tiddlers/widgets/CheckboxWidget.tid | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid index ec6e2162f..053eebab5 100644 --- a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid @@ -52,20 +52,3 @@ To use the checkbox widget in index mode set the ''index'' attribute to the inde The example below creates a checkbox that is checked if the index by the name of this tiddler in the tiddler ExampleData is equal to ''selected'' and unchecked if the index is an empty string. If the index is undefined then it defaults to an empty string, meaning the checkbox will be unchecked if the index is missing. <$macrocall $name="wikitext-example-without-html" src="""<$checkbox tiddler="ExampleData" index=<> checked="selected" unchecked="" default=""> Selected?"""/> - -!! `actions` Attribute - -This example of using the `actions` attribute shows both the [[Action Set Field Widget|ActionSetFieldWidget]] and [[Action Send Message Widget|ActionSendMessageWidget]] to demonstrate two actions. - -The [[Set Widget|SetWidget]] uses a filter value to set the value of variable `tag`. The [[Action Send Message Widget|ActionSendMessageWidget]] joins all the tags into one large tag. The [[Action Set Field Widget|ActionSetFieldWidget]] appends the tags as individual tags. In this example, the [[Field Mangler Widget|FieldManglerWidget]] is required for the [[Action Send Message Widget|ActionSendMessageWidget]] but not for [[Action Set Field Widget|ActionSetFieldWidget]]. Be aware that the action occurs whether you check or uncheck. - -It is often necessary to use triple quotes with the `actions` attribute. Alternatively, the attribute can be assigned directly from a variable with `actions=<>`. - -<$macrocall $name='wikitext-example-without-html' src='<$fieldmangler> -<$set filter="[[Features]] [[Encryption]] +[tags[]]" name="tag"> -<$checkbox actions="""<$action-setfield $field="tags" $value=<> ><$action-sendmessage $message="tm-add-tag" $param=<> />""" field="checked" checked="YES" unchecked="NO" > - Add tags from tiddlers [[Features]] and [[Encryption]] - - -' /> - From ceb2d9f119a6b01a885578c6fc8b608258185867 Mon Sep 17 00:00:00 2001 From: twMat Date: Fri, 21 Jun 2019 09:36:09 +0200 Subject: [PATCH 09/12] Update StartupActions.tid (#4002) Regarding the bulleted tag pills; they should probably also be removed in place of text but I see value in keeping them for the sake of being able to easily peek at what they tag. We should probably have a section under Ctrlpanel>Settings where any startupaction-tiddlers are listed but since we don't yet, then the mentioned tag pills could perhaps remain.... except for the one in the PR. --- editions/tw5.com/tiddlers/features/StartupActions.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/features/StartupActions.tid b/editions/tw5.com/tiddlers/features/StartupActions.tid index e1aa53204..c7a392174 100644 --- a/editions/tw5.com/tiddlers/features/StartupActions.tid +++ b/editions/tw5.com/tiddlers/features/StartupActions.tid @@ -10,7 +10,7 @@ During startup, TiddlyWiki executes any ActionWidgets found in tiddlers with the * <> (only executed when running in the browser) * <> (only executed when running under Node.js) -Startup actions are useful for customising TiddlyWiki according to environmental factors such as the screen size. For example, the following action widgets when placed in a tiddler tagged <> will cause the sidebar to be hidden by default when the screen width is less than 1000 pixels: +Startup actions are useful for customising TiddlyWiki according to environmental factors such as the screen size. For example, the following action widgets when placed in a tiddler tagged `$:/tags/StartupAction/Browser` will cause the sidebar to be hidden by default when the screen width is less than 1000 pixels: ``` <$reveal type="lt" state="$:/info/browser/screen/width" text="3000"> From 02b141f97f0beb4dc702c62cb3968f5a050854fc Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Tue, 2 Jul 2019 15:35:11 +0100 Subject: [PATCH 10/12] Docs: typo in "Using the external JavaScript template" --- .../webserver/Using the external JavaScript template.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/webserver/Using the external JavaScript template.tid b/editions/tw5.com/tiddlers/webserver/Using the external JavaScript template.tid index c6c2373cb..122a30629 100644 --- a/editions/tw5.com/tiddlers/webserver/Using the external JavaScript template.tid +++ b/editions/tw5.com/tiddlers/webserver/Using the external JavaScript template.tid @@ -12,7 +12,7 @@ tiddlywiki editions/tw5.com-server/ --listen host=0.0.0.0 "root-tiddler=$:/core/ !! Background -TiddlyWiki in the single file configuration ordinarily packs everything into a single file: your data, and the JavaScript, CSS and HTML comprising TiddlyWiki itself. This lack of dependencies is usually very convenient: it means that it is impossible for the parts of a TiddlyWiki to become separated, and enormously improves the changes of it still functioning in the future. +TiddlyWiki in the single file configuration ordinarily packs everything into a single file: your data, and the JavaScript, CSS and HTML comprising TiddlyWiki itself. This lack of dependencies is usually very convenient: it means that it is impossible for the parts of a TiddlyWiki to become separated, and enormously improves the chances of it still functioning in the future. However, there is some inefficiency in this arrangement because the core code is repeatedly loaded and saved every time the content of the wiki is saved. This inefficiency is partially ameliorated when working in the client server configuration because once the wiki is loaded by the browser the synchronisation process only transmits individual tiddlers back and forth to the server. From 8a53cca00dfaec478c65b206f6bc7c2d3932657f Mon Sep 17 00:00:00 2001 From: morosanuae Date: Mon, 15 Jul 2019 20:09:40 +0300 Subject: [PATCH 11/12] Adding the "Font Awesome 5 Free SVGs for TiddlyWiki" resource site (#4112) --- ...nt Awesome 5 Free SVGs for TiddlyWiki by morosanuae | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae diff --git a/editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae b/editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae new file mode 100644 index 000000000..681a45f0b --- /dev/null +++ b/editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae @@ -0,0 +1,10 @@ +created: 20190710085450262 +modified: 20190710090131976 +tags: SVG Images [[Font Awesome 5]] Resources +title: "Font Awesome 5 Free SVGs for TiddlyWiki" by morosanuae +type: text/vnd.tiddlywiki +url: http://fa5-free-svg.tiddlyspot.com + +The ''Font Awesome 5 Free'' SVG images collection converted to tiddlers that you can easily import (drag'n'drop) in your wiki. + +{{!!url}} From 27b75f39225f72f77129d1fd519794c26834dff5 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Tue, 16 Jul 2019 15:43:18 +0100 Subject: [PATCH 12/12] Fix missing .tid extension from #4112 --- ... => Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae.tid} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename editions/tw5.com/tiddlers/community/resources/{Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae => Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae.tid} (100%) diff --git a/editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae b/editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae.tid similarity index 100% rename from editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae rename to editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae.tid