diff --git a/core/modules/utils/logger.js b/core/modules/utils/logger.js index 7dc35899f..1bee04646 100644 --- a/core/modules/utils/logger.js +++ b/core/modules/utils/logger.js @@ -48,7 +48,9 @@ Logger.prototype.log = function(/* args */) { this.saveBufferLogger.buffer = this.saveBufferLogger.buffer.slice(-this.saveBufferLogger.saveLimit); } if(console !== undefined && console.log !== undefined) { - return Function.apply.call(console.log, console, [$tw.utils.terminalColour(this.colour),this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0)).concat($tw.utils.terminalColour())); + var logMessage = [$tw.utils.terminalColour(this.colour) + this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0)); + logMessage[logMessage.length-1] += $tw.utils.terminalColour(); + return Function.apply.call(console.log, console, logMessage); } } }; diff --git a/editions/fr-FR/tiddlers/$__core_ui_TagTemplate.tid b/editions/fr-FR/tiddlers/$__core_ui_TagTemplate.tid deleted file mode 100644 index e4b944483..000000000 --- a/editions/fr-FR/tiddlers/$__core_ui_TagTemplate.tid +++ /dev/null @@ -1,33 +0,0 @@ -created: 20160504080001125 -modified: 20160504080318928 -title: $:/core/ui/TagTemplate -type: text/vnd.tiddlywiki - -\define tag-styles() -background-color:$(backgroundColor)$; -fill:$(foregroundColor)$; -color:$(foregroundColor)$; -\end - -\define tag-body-inner(colour,fallbackTarget,colourA,colourB) -<$set name="foregroundColor" value=<>> -<$set name="backgroundColor" value="""$colour$"""> -<$button popup=<> class="tc-btn-invisible tc-tag-label" style=<>> -<$transclude tiddler={{!!icon}}/> <$view field="fr-title"><$view field="title" format="text" /> - -<$reveal state=<> type="popup" position="below" animate="yes">
<$transclude tiddler="$:/core/ui/ListItemTemplate"/> -
-<$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/> -
- - - -\end - -\define tag-body(colour,palette) - -<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/> - -\end - -<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/> \ No newline at end of file diff --git a/editions/fr-FR/tiddlers/system/$__core_macros_list.tid b/editions/fr-FR/tiddlers/system/$__core_macros_list.tid new file mode 100644 index 000000000..93349d46c --- /dev/null +++ b/editions/fr-FR/tiddlers/system/$__core_macros_list.tid @@ -0,0 +1,113 @@ +created: 20220830224607117 +modified: 20220830224638865 +tags: $:/tags/Macro +title: $:/core/macros/list + +\define list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage) +\whitespace trim +<$type$ class="$class$"> +<$list filter="$filter$" emptyMessage=<<__emptyMessage__>>> +<$subtype$> +<$link to={{!!title}}> +<$let tv-wikilinks="no"> +<$transclude field="caption"> +<$view field="title"/> + + + + + + +\end + +\define list-links-draggable-drop-actions() +<$action-listops $tiddler=<> $field=<> $subfilter="+[insertbefore,]"/> +\end + +\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate) +\whitespace trim + +<$vars targetTiddler="""$tiddler$""" targetField="""$field$"""> +<$type$ class="$class$"> +<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>> +<$droppable actions=<> tag="""$subtype$""" enable=<>> +
+
+<$transclude tiddler="""$itemTemplate$"""> +<$link to={{!!title}}> +<$let tv-wikilinks="no"> +<$transclude field="caption"> +<$view field="title"/> + + + + +
+ + +<$tiddler tiddler=""> +<$droppable actions=<> tag="div" enable=<>> +
+{{$:/core/images/blank}} +
+
+ + + + + +\end + +\define list-tagged-draggable-drop-actions(tag) +\whitespace trim + +<$set name="order" filter="[<__tag__>tagging[]]"> + +<$list filter="[<__tag__>tagging[]]"> +<$action-deletefield $field="list-before"/> +<$action-deletefield $field="list-after"/> + + +<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist] +[insertbefore,]"/> + + + + +<$list filter="[!contains:tags<__tag__>]"> +<$fieldmangler tiddler=<>> +<$action-sendmessage $message="tm-add-tag" $param=<<__tag__>>/> + + + +\end + +\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"") +\whitespace trim + +<$set name="tag" value=<<__tag__>>> +<$list filter="[<__tag__>tagging[]$subFilter$]" emptyMessage=<<__emptyMessage__>> storyview=<<__storyview__>>> +<$elementTag$ class="tc-menu-list-item"> +<$droppable actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>""" enable=<>> +<$elementTag$ class="tc-droppable-placeholder"/> +<$elementTag$> +<$transclude tiddler="""$itemTemplate$"""> +<$link to={{!!title}}> +<$view field="fr-title"> +<$view field="title"/> + + + + + + + +<$tiddler tiddler=""> +<$droppable actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>""" enable=<>> +<$elementTag$ class="tc-droppable-placeholder"/> +<$elementTag$ style="height:0.5em;"> + + + + + +\end diff --git a/editions/fr-FR/tiddlers/system/$__core_macros_tag.tid b/editions/fr-FR/tiddlers/system/$__core_macros_tag.tid new file mode 100644 index 000000000..76b7bf70e --- /dev/null +++ b/editions/fr-FR/tiddlers/system/$__core_macros_tag.tid @@ -0,0 +1,39 @@ +created: 20220830190922373 +modified: 20220830191056761 +tags: $:/tags/Macro +title: $:/core/macros/tag + +\define tag-pill-styles() +background-color:$(backgroundColor)$; +fill:$(foregroundColor)$; +color:$(foregroundColor)$; +\end + + +\define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions) +<$vars + foregroundColor=<> + backgroundColor="""$colour$""" +><$element-tag$ + $element-attributes$ + class="tc-tag-label tc-btn-invisible" + style=<> +>$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="fr-title" format="text"><$view tiddler=<<__tag__>> field="title" format="text" /> +\end + +\define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions) +<$macrocall $name="tag-pill-inner" tag=<<__tag__>> icon="""$icon$""" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/> +\end + +\define tag-pill(tag,element-tag:"span",element-attributes:"",actions:"") +\whitespace trim +>> +<$let currentTiddler=<<__tag__>>> +<$macrocall $name="tag-pill-body" tag=<<__tag__>> icon={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/> + + +\end + +\define tag(tag) +{{$tag$||$:/core/ui/TagTemplate}} +\end diff --git a/editions/fr-FR/tiddlers/system/$__core_ui_TagPickerTagTemplate.tid b/editions/fr-FR/tiddlers/system/$__core_ui_TagPickerTagTemplate.tid new file mode 100644 index 000000000..30ebae9d3 --- /dev/null +++ b/editions/fr-FR/tiddlers/system/$__core_ui_TagPickerTagTemplate.tid @@ -0,0 +1,25 @@ +created: 20220830194301860 +modified: 20220830194658750 +title: $:/core/ui/TagPickerTagTemplate + +\whitespace trim +<$button class=<> tag="a" tooltip={{$:/language/EditTemplate/Tags/Add/Button/Hint}}> +<$list filter="[minlength[1]]"> +<$action-listops $tiddler=<> $field=<> $subfilter="[]"/> + +<$set name="currentTiddlerCSSEscaped" value={{{ [escapecss[]] }}}> +<$action-sendmessage $message="tm-focus-selector" $param=<> preventScroll="true"/> + +<> +<$list filter="[minlength[1]]"> +<$action-setfield $tiddler=<> text="yes"/> + +<> +<$set name="backgroundColor" value={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}> +<$wikify name="foregroundColor" text="""<$macrocall $name="contrastcolour" target=<> fallbackTarget=<> colourA=<> colourB=<>/>"""> +>> +{{||$:/core/ui/TiddlerIcon}}<$view field="fr-title" format="text"><$view field="title" format="text"/> + + + + diff --git a/editions/tw.org/tiddlers/Code of Conduct.tid b/editions/tw.org/tiddlers/Code of Conduct.tid index 830610ba5..723e3ae00 100644 --- a/editions/tw.org/tiddlers/Code of Conduct.tid +++ b/editions/tw.org/tiddlers/Code of Conduct.tid @@ -1,5 +1,5 @@ created: 20220721200137586 -modified: 20220721200137586 +modified: 20220819200137586 tags: [[Table of Contents]] title: Code of Conduct type: text/vnd.tiddlywiki @@ -17,6 +17,7 @@ These principles guide technical and non-technical decisions, and help contribut * We recognise that the motivation for sharing and helping is usually for appreciation, and not financial gain, and so we take care to acknowledge and ''thank the people who enrich the community by sharing what they have created'' * While we are united in our interest in TiddlyWiki, we differ in every other conceivable way. We choose to focus on what unites us, and ''avoid unnecessarily mixing contentious topics like religion and politics'' * We treat each other with respect, and start with the assumption that ''others are acting in good faith'' +* We avoid discriminatory language * We try to use our strength as a community to help others * We avoid responding when angry or upset because we try to de-escalate conflict * We make sure we critique ideas, not people @@ -27,4 +28,6 @@ These principles guide technical and non-technical decisions, and help contribut Our discussions are in English. It is not the first language of many people in the community, nor do we all share the same cultural background and reference points. So we take care to use language that is clear and unambigous, and avoid cultural references or jokes that will not be widely understood. +It is not acceptable to make jokes or other comments that discriminate by race, gender, sexuality, or other protected characteristic. + As an inclusive community, we are committed to making sure that TiddlyWiki is an accessible tool that understands the needs of people with disabilities. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/community/plugins/GSD5.tid b/editions/tw5.com/tiddlers/community/plugins/GSD5.tid index 6471a41bf..8239fb06b 100644 --- a/editions/tw5.com/tiddlers/community/plugins/GSD5.tid +++ b/editions/tw5.com/tiddlers/community/plugins/GSD5.tid @@ -1,9 +1,9 @@ created: 20141230182901899 -modified: 20210106151027090 +modified: 20220226205227090 tags: [[Community Editions]] [[Community Plugins]] title: "GSD5" by Roma Hicks type: text/vnd.tiddlywiki -url: http://gsd5.tiddlyspot.com/ +url: http://gsd5.tiddlyhost.com/ An adaptation of the [[TiddlyWiki powered GTD® system formerly known as MonkeyGTD|http://mgsd.tiddlyspot.com/]] for TiddlyWiki version 5. diff --git a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid index 7b0d5dedf..193c02c70 100644 --- a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid +++ b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid @@ -1,16 +1,12 @@ created: 20131129090249275 -modified: 20200507203622933 +modified: 20220819041016415 tags: [[Working with TiddlyWiki]] title: GettingStarted type: text/vnd.tiddlywiki -The easiest way to use TiddlyWiki is to sign up for a free account with [[Tiddlyhost]], an independently run community service: +The easiest way to use ~TiddlyWiki is to sign up for a free account with [[Tiddlyhost|https://tiddlyhost.com/]], an independently run community service. If you find Tiddlyhost useful, please consider [[donation or sponsorship|https://tiddlyhost.com/donate]]. -https://tiddlyhost.com/ - -If you find Tiddlyhost useful, please consider [[donation or sponsorship|https://tiddlyhost.com/donate]]. - -Click here to download an empty copy of TiddlyWiki: {{$:/editions/tw5.com/snippets/download-empty-button}} +Click here to download an empty copy of ~TiddlyWiki: {{$:/editions/tw5.com/snippets/download-empty-button}} The next step is to choose a method for saving changes. There's a wide variety of methods available, with different features and limitations. Click on the badge for a method to see more information about it. You can also click on one of the platform filters to restrict the listing to methods that work with that platform. diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting Sync System Tiddlers From Server.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting Sync System Tiddlers From Server.tid new file mode 100644 index 000000000..88f82b4b6 --- /dev/null +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting Sync System Tiddlers From Server.tid @@ -0,0 +1,13 @@ +created: 20220909094340097 +modified: 20220909094340097 +title: Hidden Setting: Sync System Tiddlers From Server +tags: [[Hidden Settings]] + +<<.from-version "5.1.23">> Determines whether system tiddlers are synced from the server under Node.js. (Note that this is a one-way setting; system tiddlers are always synced //to// the server). + +* `no` -- system tiddlers are not synced from the server (default) +* `yes` -- system tiddlers are synced from the server + +Engaging sync of system tiddlers means that tiddlers such as $:/StoryList and $:/HistoryList get synced, which can lead to unexpected outcomes when multiple users are connected to the same server at the same time (it means that the story sequence is synced between all the users). + +$:/config/SyncSystemTiddlersFromServer \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid index 49b255afd..d435d5f4f 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid @@ -22,7 +22,7 @@ The new tiddler message is usually generated with the ButtonWidget or ActionSend ! Examples -To make a button that creates new tiddlers tagged "task", create a tiddler called "TaskTemplate" with that tag, and then make your button like this: +To make a button that creates new tiddlers tagged "task", create a tiddler called "~TaskTemplate" with that tag, and then make your button like this: ``` <$button message="tm-new-tiddler" param="TaskTemplate">New Task diff --git a/editions/tw5.com/tiddlers/saving/Saving.tid b/editions/tw5.com/tiddlers/saving/Saving.tid index fda400295..8210bba1f 100644 --- a/editions/tw5.com/tiddlers/saving/Saving.tid +++ b/editions/tw5.com/tiddlers/saving/Saving.tid @@ -1,5 +1,5 @@ created: 20140912140651119 -modified: 20220401151525812 +modified: 20220812144516626 saving-browser: Firefox Chrome Edge [[Internet Explorer]] Safari Opera [[Standalone App]] saving-os: Windows Mac Linux Android iOS tags: [[Working with TiddlyWiki]] @@ -34,7 +34,7 @@ type: text/vnd.tiddlywiki \end <$vars stateTiddler=<> > -Available methods for saving changes with TiddlyWiki: +Available methods for saving changes with ~TiddlyWiki:
diff --git a/editions/tw5.com/tiddlers/system/wikitext-macros.tid b/editions/tw5.com/tiddlers/system/wikitext-macros.tid index 2c10a678b..5bef37c2c 100644 --- a/editions/tw5.com/tiddlers/system/wikitext-macros.tid +++ b/editions/tw5.com/tiddlers/system/wikitext-macros.tid @@ -46,15 +46,11 @@ open the ''example edition'' in a new window <$macrocall $name="copy-to-clipboard-above-right" src=<<__src__>>/> -``` -$src$ -``` +<$codeblock code=<<__src__>>/> That renders as: -$$$text/vnd.tiddlywiki -$src$ -$$$ +<$macrocall $name="__src__"/> ... and the underlying HTML is: @@ -69,15 +65,11 @@ $$$ <$macrocall $name="copy-to-clipboard-above-right" src=<<__src__>>/> -``` -$src$ -``` +<$codeblock code=<<__src__>>/> That renders as: -$$$text/vnd.tiddlywiki -$src$ -$$$ +<$macrocall $name="__src__"/>
\end diff --git a/editions/tw5.com/tiddlers/webserver/WebServer API_ Get All Tiddlers.tid b/editions/tw5.com/tiddlers/webserver/WebServer API_ Get All Tiddlers.tid index 45bd1e27e..9c38f6157 100644 --- a/editions/tw5.com/tiddlers/webserver/WebServer API_ Get All Tiddlers.tid +++ b/editions/tw5.com/tiddlers/webserver/WebServer API_ Get All Tiddlers.tid @@ -1,5 +1,5 @@ created: 20181002131215403 -modified: 2020031109590546 +modified: 20220909094340097 tags: [[WebServer API]] title: WebServer API: Get All Tiddlers type: text/vnd.tiddlywiki @@ -17,6 +17,8 @@ Parameters: In order to avoid denial of service attacks with malformed filters in the default configuration the only filter that is accepted is the default filter "[all[tiddlers]!is[system]sort[title]]"; attempts to use any other filter will result in an HTTP 403 error. +<<.note "System tiddlers will not be returned by this API unless the [[Hidden Setting: Sync System Tiddlers From Server]] is explicitly switched on by setting $:/config/SyncSystemTiddlersFromServer to `yes`">> + To enable a particular filter, create a tiddler with the title "$:/config/Server/ExternalFilters/" concatenated with the filter text, and the text field set to "yes". For example, the TiddlyWeb plugin includes the following shadow tiddler to enable the filter that it requires: ``` diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 3405bfa5e..0ad84a378 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -497,3 +497,5 @@ Nolan Darilek, @NDarilek, 2022/06/21 Keiichi Shiga (🎈 BALLOON | FU-SEN), @fu-sen. 2022/07/07 Nathaniel Knight, @nathanielknight, 2022/07/26 + +HuanCheng Bai, @bestony, 2022/09/17