diff --git a/bin/build-site.sh b/bin/build-site.sh index f6cc2dfea..ba2fd80ec 100755 --- a/bin/build-site.sh +++ b/bin/build-site.sh @@ -5,7 +5,7 @@ # Default to the current version number for building the plugin library if [ -z "$TW5_BUILD_VERSION" ]; then - TW5_BUILD_VERSION=v5.1.19 + TW5_BUILD_VERSION=v5.1.21 fi echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]" diff --git a/bin/npm-publish.sh b/bin/npm-publish.sh new file mode 100755 index 000000000..c37de5c24 --- /dev/null +++ b/bin/npm-publish.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# publish to npm + +./bin/clean.sh + +npm publish || exit 1 diff --git a/bin/quick-bld.sh b/bin/quick-bld.sh new file mode 100755 index 000000000..63da9aacc --- /dev/null +++ b/bin/quick-bld.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Abbreviated build script for building prerelease + +tiddlywiki editions/prerelease \ + --verbose \ + --build favicon index empty \ + || exit 1 diff --git a/bin/verbump.sh b/bin/verbump.sh new file mode 100755 index 000000000..ae4b0da80 --- /dev/null +++ b/bin/verbump.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Bump to a new version number + +if [ -z "$1" ] + then + echo "Missing version (eg '5.1.38-prerelease')" + exit 1 +fi + +# Set the new version number (will also commit and tag the release) + +npm version $1 -m "Version number update for $1" || exit 1 + +# Make sure our tags are pushed to the origin server + +git push origin --tags || exit 1 diff --git a/boot/boot.js b/boot/boot.js index 444bf5c32..9f867c48a 100644 --- a/boot/boot.js +++ b/boot/boot.js @@ -314,13 +314,13 @@ $tw.utils.parseDate = function(value) { // Stringify an array of tiddler titles into a list string $tw.utils.stringifyList = function(value) { if($tw.utils.isArray(value)) { - var result = []; - for(var t=0; t=0; t--) { var tiddler = pluginTiddlers[t]; - if(tiddler.fields["plugin-type"] === pluginType) { - titles.push(tiddler.fields.title); + if(tiddler.fields["plugin-type"] && (!pluginType || tiddler.fields["plugin-type"] === pluginType) && (!titles || titles.indexOf(tiddler.fields.title) !== -1)) { + unregisteredTitles.push(tiddler.fields.title); pluginTiddlers.splice(t,1); } } - return titles; + return unregisteredTitles; }; // Unpack the currently registered plugins, creating shadow tiddlers for their constituent tiddlers diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index 4ccb30787..d1fd8f374 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -78,6 +78,7 @@ Plugins/NoInfoFound/Hint: No ''"<$text text=<>/>"'' found Plugins/NotInstalled/Hint: This plugin is not currently installed Plugins/OpenPluginLibrary: open plugin library Plugins/ClosePluginLibrary: close plugin library +Plugins/PluginWillRequireReload: (requires reload) Plugins/Plugins/Caption: Plugins Plugins/Plugins/Hint: Plugins Plugins/Reinstall/Caption: reinstall @@ -102,7 +103,7 @@ Saving/GitService/UserName: Username Saving/GitService/GitHub/Caption: ~GitHub Saver Saving/GitService/GitHub/Password: Password, OAUTH token, or personal access token (see [[GitHub help page|https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line]] for details) Saving/GitService/GitLab/Caption: ~GitLab Saver -Saving/GitService/GitLab/Password: Personal access token for API (see [[GitLab help page|https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html for details]] for details) +Saving/GitService/GitLab/Password: Personal access token for API (see [[GitLab help page|https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html]] for details) Saving/TiddlySpot/Advanced/Heading: Advanced Settings Saving/TiddlySpot/BackupDir: Backup Directory Saving/TiddlySpot/Backups: Backups diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids index 0f267186e..599b575eb 100644 --- a/core/language/en-GB/Misc.multids +++ b/core/language/en-GB/Misc.multids @@ -59,7 +59,7 @@ MissingTiddler/Hint: Missing tiddler "<$text text=<>/>" -- click No: No OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team. -PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to plugins to take effect +PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to ~JavaScript plugins to take effect RecentChanges/DateFormat: DDth MMM YYYY SystemTiddler/Tooltip: This is a system tiddler SystemTiddlers/Include/Prompt: Include system tiddlers diff --git a/core/modules/commands/makelibrary.js b/core/modules/commands/makelibrary.js index bb149fd16..ce7150f0c 100644 --- a/core/modules/commands/makelibrary.js +++ b/core/modules/commands/makelibrary.js @@ -59,7 +59,7 @@ Command.prototype.execute = function() { title: upgradeLibraryTitle, type: "application/json", "plugin-type": "library", - "text": JSON.stringify({tiddlers: tiddlers},null,$tw.config.preferences.jsonSpaces) + "text": JSON.stringify({tiddlers: tiddlers}) }; wiki.addTiddler(new $tw.Tiddler(pluginFields)); return null; diff --git a/core/modules/commands/savelibrarytiddlers.js b/core/modules/commands/savelibrarytiddlers.js index 44feea071..b1874c9b5 100644 --- a/core/modules/commands/savelibrarytiddlers.js +++ b/core/modules/commands/savelibrarytiddlers.js @@ -65,10 +65,11 @@ Command.prototype.execute = function() { // Save each JSON file and collect the skinny data var pathname = path.resolve(self.commander.outputPath,basepath + encodeURIComponent(title) + ".json"); $tw.utils.createFileDirectories(pathname); - fs.writeFileSync(pathname,JSON.stringify(tiddler,null,$tw.config.preferences.jsonSpaces),"utf8"); + fs.writeFileSync(pathname,JSON.stringify(tiddler),"utf8"); // Collect the skinny list data var pluginTiddlers = JSON.parse(tiddler.text), readmeContent = (pluginTiddlers.tiddlers[title + "/readme"] || {}).text, + doesContainJavaScript = !!$tw.wiki.doesPluginInfoContainModules(pluginTiddlers), iconTiddler = pluginTiddlers.tiddlers[title + "/icon"] || {}, iconType = iconTiddler.type, iconText = iconTiddler.text, @@ -76,7 +77,12 @@ Command.prototype.execute = function() { if(iconType && iconText) { iconContent = $tw.utils.makeDataUri(iconText,iconType); } - skinnyList.push($tw.utils.extend({},tiddler,{text: undefined, readme: readmeContent, icon: iconContent})); + skinnyList.push($tw.utils.extend({},tiddler,{ + text: undefined, + readme: readmeContent, + "contains-javascript": doesContainJavaScript ? "yes" : "no", + icon: iconContent + })); }); // Save the catalogue tiddler if(skinnyListTitle) { diff --git a/core/modules/filters/field.js b/core/modules/filters/field.js index 7480a87cb..fc8223555 100644 --- a/core/modules/filters/field.js +++ b/core/modules/filters/field.js @@ -53,7 +53,7 @@ exports.field = function(source,operator,options) { } }); } else { - if(source.byField) { + if(source.byField && operator.operand) { indexedResults = source.byField(fieldname,operator.operand); if(indexedResults) { return indexedResults diff --git a/core/modules/filters/is/binary.js b/core/modules/filters/is/binary.js new file mode 100644 index 000000000..01b9aabd3 --- /dev/null +++ b/core/modules/filters/is/binary.js @@ -0,0 +1,36 @@ +/*\ +title: $:/core/modules/filters/is/binary.js +type: application/javascript +module-type: isfilteroperator + +Filter function for [is[binary]] + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.binary = function(source,prefix,options) { + var results = []; + if(prefix === "!") { + source(function(tiddler,title) { + if(!options.wiki.isBinaryTiddler(title)) { + results.push(title); + } + }); + } else { + source(function(tiddler,title) { + if(options.wiki.isBinaryTiddler(title)) { + results.push(title); + } + }); + } + return results; +}; + +})(); diff --git a/core/modules/parsers/wikiparser/rules/transcludeblock.js b/core/modules/parsers/wikiparser/rules/transcludeblock.js index 1a5df1e06..56a4f63b8 100644 --- a/core/modules/parsers/wikiparser/rules/transcludeblock.js +++ b/core/modules/parsers/wikiparser/rules/transcludeblock.js @@ -27,8 +27,6 @@ exports.init = function(parser) { }; exports.parse = function() { - // Move past the match - this.parser.pos = this.matchRegExp.lastIndex; // Move past the match this.parser.pos = this.matchRegExp.lastIndex; // Get the match details diff --git a/core/modules/pluginswitcher.js b/core/modules/pluginswitcher.js index ab82be933..395dc8b20 100644 --- a/core/modules/pluginswitcher.js +++ b/core/modules/pluginswitcher.js @@ -60,6 +60,8 @@ PluginSwitcher.prototype.switchPlugins = function() { } }; accumulatePlugin(selectedPluginTitle); + // Read the plugin info for the incoming plugins + var changes = $tw.wiki.readPluginInfo(plugins); // Unregister any existing theme tiddlers var unregisteredTiddlers = $tw.wiki.unregisterPluginTiddlers(this.pluginType); // Register any new theme tiddlers diff --git a/core/modules/savers/gitlab.js b/core/modules/savers/gitlab.js index fcb3b51e8..cce69099c 100644 --- a/core/modules/savers/gitlab.js +++ b/core/modules/savers/gitlab.js @@ -48,12 +48,9 @@ GitLabSaver.prototype.save = function(text,method,callback) { var uri = endpoint + "/projects/" + encodeURIComponent(repo) + "/repository/"; // Perform a get request to get the details (inc shas) of files in the same path as our file $tw.utils.httpRequest({ - url: uri + "tree/" + encodeURIComponent(path.replace(/^\/+|\/$/g, '')), + url: uri + "tree/?path=" + encodeURIComponent(path.replace(/^\/+|\/$/g, '')) + "&branch=" + encodeURIComponent(branch.replace(/^\/+|\/$/g, '')), type: "GET", headers: headers, - data: { - ref: branch - }, callback: function(err,getResponseDataJson,xhr) { var getResponseData,sha = ""; if(err && xhr.status !== 404) { @@ -71,7 +68,7 @@ GitLabSaver.prototype.save = function(text,method,callback) { } var data = { commit_message: $tw.language.getRawString("ControlPanel/Saving/GitService/CommitMessage"), - content: $tw.utils.base64Encode(text), + content: text, branch: branch, sha: sha }; diff --git a/core/modules/server/routes/get-index.js b/core/modules/server/routes/get-index.js index 08021af64..c90341925 100644 --- a/core/modules/server/routes/get-index.js +++ b/core/modules/server/routes/get-index.js @@ -12,22 +12,21 @@ GET / /*global $tw: false */ "use strict"; -var zlib = require('zlib'); +var zlib = require("zlib"); exports.method = "GET"; exports.path = /^\/$/; exports.handler = function(request,response,state) { - var acceptEncoding = request.headers['accept-encoding']; - if (!acceptEncoding) { acceptEncoding = ''; } - - var text = state.wiki.renderTiddler(state.server.get("root-render-type"),state.server.get("root-tiddler")); - - var responseHeaders = { + var acceptEncoding = request.headers["accept-encoding"]; + if(!acceptEncoding) { + acceptEncoding = ""; + } + var text = state.wiki.renderTiddler(state.server.get("root-render-type"),state.server.get("root-tiddler")), + responseHeaders = { "Content-Type": state.server.get("root-serve-type") }; - /* If the gzip=yes flag for `listen` is set, check if the user agent permits compression. If so, compress our response. Note that we use the synchronous @@ -36,15 +35,14 @@ exports.handler = function(request,response,state) { */ if(state.server.enableGzip) { if (/\bdeflate\b/.test(acceptEncoding)) { - responseHeaders['Content-Encoding'] = 'deflate'; + responseHeaders["Content-Encoding"] = "deflate"; text = zlib.deflateSync(text); } else if (/\bgzip\b/.test(acceptEncoding)) { - responseHeaders['Content-Encoding'] = 'gzip'; + responseHeaders["Content-Encoding"] = "gzip"; text = zlib.gzipSync(text); } } - - response.writeHead(200, responseHeaders); + response.writeHead(200,responseHeaders); response.end(text); }; diff --git a/core/modules/startup/info.js b/core/modules/startup/info.js index 1ebf568f4..7efaa5b0e 100644 --- a/core/modules/startup/info.js +++ b/core/modules/startup/info.js @@ -18,6 +18,8 @@ exports.before = ["startup"]; exports.after = ["load-modules"]; exports.synchronous = true; +var TITLE_INFO_PLUGIN = "$:/temp/info-plugin"; + exports.startup = function() { // Collect up the info tiddlers var infoTiddlerFields = {}; @@ -32,15 +34,15 @@ exports.startup = function() { }); } }); - // Bake the info tiddlers into a plugin + // Bake the info tiddlers into a plugin. We use the non-standard plugin-type "info" because ordinary plugins are only registered asynchronously after being loaded dynamically var fields = { - title: "$:/temp/info-plugin", + title: TITLE_INFO_PLUGIN, type: "application/json", "plugin-type": "info", text: JSON.stringify({tiddlers: infoTiddlerFields},null,$tw.config.preferences.jsonSpaces) }; $tw.wiki.addTiddler(new $tw.Tiddler(fields)); - $tw.wiki.readPluginInfo(); + $tw.wiki.readPluginInfo([TITLE_INFO_PLUGIN]); $tw.wiki.registerPluginTiddlers("info"); $tw.wiki.unpackPluginTiddlers(); }; diff --git a/core/modules/startup/plugins.js b/core/modules/startup/plugins.js new file mode 100644 index 000000000..5dd03bbf1 --- /dev/null +++ b/core/modules/startup/plugins.js @@ -0,0 +1,59 @@ +/*\ +title: $:/core/modules/startup/plugins.js +type: application/javascript +module-type: startup + +Startup logic concerned with managing plugins + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +// Export name and synchronous status +exports.name = "plugins"; +exports.after = ["load-modules"]; +exports.synchronous = true; + +var TITLE_REQUIRE_RELOAD_DUE_TO_PLUGIN_CHANGE = "$:/status/RequireReloadDueToPluginChange"; + +var PREFIX_CONFIG_REGISTER_PLUGIN_TYPE = "$:/config/RegisterPluginType/"; + +exports.startup = function() { + $tw.wiki.addTiddler({title: TITLE_REQUIRE_RELOAD_DUE_TO_PLUGIN_CHANGE,text: "no"}); + $tw.wiki.addEventListener("change",function(changes) { + var changesToProcess = [], + requireReloadDueToPluginChange = false; + $tw.utils.each(Object.keys(changes),function(title) { + var tiddler = $tw.wiki.getTiddler(title), + containsModules = $tw.wiki.doesPluginContainModules(title); + if(containsModules) { + requireReloadDueToPluginChange = true; + } else if(tiddler) { + var pluginType = tiddler.fields["plugin-type"]; + if($tw.wiki.getTiddlerText(PREFIX_CONFIG_REGISTER_PLUGIN_TYPE + (tiddler.fields["plugin-type"] || ""),"no") === "yes") { + changesToProcess.push(title); + } + } + }); + if(requireReloadDueToPluginChange) { + $tw.wiki.addTiddler({title: TITLE_REQUIRE_RELOAD_DUE_TO_PLUGIN_CHANGE,text: "yes"}); + } + // Read or delete the plugin info of the changed tiddlers + if(changesToProcess.length > 0) { + var changes = $tw.wiki.readPluginInfo(changesToProcess); + if(changes.modifiedPlugins.length > 0 || changes.deletedPlugins.length > 0) { + // (Re-)register any modified plugins + $tw.wiki.registerPluginTiddlers(null,changes.modifiedPlugins); + // Unregister any deleted plugins + $tw.wiki.unregisterPluginTiddlers(null,changes.deletedPlugins); + // Unpack the shadow tiddlers + $tw.wiki.unpackPluginTiddlers(); + } + } + }); +}; + +})(); diff --git a/core/modules/upgraders/plugins.js b/core/modules/upgraders/plugins.js index acd8f6db7..d1e699762 100644 --- a/core/modules/upgraders/plugins.js +++ b/core/modules/upgraders/plugins.js @@ -39,26 +39,29 @@ exports.upgrade = function(wiki,titles,tiddlers) { $tw.utils.each(titles,function(title) { var incomingTiddler = tiddlers[title]; // Check if we're dealing with a plugin - if(incomingTiddler && incomingTiddler["plugin-type"] && incomingTiddler.version) { - // Upgrade the incoming plugin if it is in the upgrade library - var libraryTiddler = getLibraryTiddler(title); - if(libraryTiddler && libraryTiddler["plugin-type"] && libraryTiddler.version) { - tiddlers[title] = libraryTiddler; - messages[title] = $tw.language.getString("Import/Upgrader/Plugins/Upgraded",{variables: {incoming: incomingTiddler.version, upgraded: libraryTiddler.version}}); - return; - } - // Suppress the incoming plugin if it is older than the currently installed one - var existingTiddler = wiki.getTiddler(title); - if(existingTiddler && existingTiddler.hasField("plugin-type") && existingTiddler.hasField("version")) { - // Reject the incoming plugin by blanking all its fields - if($tw.utils.checkVersions(existingTiddler.fields.version,incomingTiddler.version)) { - tiddlers[title] = Object.create(null); - messages[title] = $tw.language.getString("Import/Upgrader/Plugins/Suppressed/Version",{variables: {incoming: incomingTiddler.version, existing: existingTiddler.fields.version}}); + if(incomingTiddler && incomingTiddler["plugin-type"]) { + // Check whether the plugin contains JS modules + var doesContainJavaScript = $tw.wiki.doesPluginInfoContainModules(JSON.parse(incomingTiddler.text)) ? ($tw.wiki.getTiddlerText("$:/language/ControlPanel/Plugins/PluginWillRequireReload") + " ") : ""; + messages[title] = doesContainJavaScript; + if(incomingTiddler.version) { + // Upgrade the incoming plugin if it is in the upgrade library + var libraryTiddler = getLibraryTiddler(title); + if(libraryTiddler && libraryTiddler["plugin-type"] && libraryTiddler.version) { + tiddlers[title] = libraryTiddler; + messages[title] = doesContainJavaScript + $tw.language.getString("Import/Upgrader/Plugins/Upgraded",{variables: {incoming: incomingTiddler.version, upgraded: libraryTiddler.version}}); return; } + // Suppress the incoming plugin if it is older than the currently installed one + var existingTiddler = wiki.getTiddler(title); + if(existingTiddler && existingTiddler.hasField("plugin-type") && existingTiddler.hasField("version")) { + // Reject the incoming plugin by blanking all its fields + if($tw.utils.checkVersions(existingTiddler.fields.version,incomingTiddler.version)) { + tiddlers[title] = Object.create(null); + messages[title] = doesContainJavaScript + $tw.language.getString("Import/Upgrader/Plugins/Suppressed/Version",{variables: {incoming: incomingTiddler.version, existing: existingTiddler.fields.version}}); + return; + } + } } - } - if(incomingTiddler && incomingTiddler["plugin-type"]) { // Check whether the plugin is on the blocked list var blockInfo = BLOCKED_PLUGINS[title]; if(blockInfo) { diff --git a/core/modules/upgraders/system.js b/core/modules/upgraders/system.js index fb6e1dd0c..de7c48f52 100644 --- a/core/modules/upgraders/system.js +++ b/core/modules/upgraders/system.js @@ -35,17 +35,17 @@ exports.upgrade = function(wiki,titles,tiddlers) { } for(var t=0; t +
<$reveal type="nomatch" state=<> text="yes" default="""$default-popup-state$"""> <$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="yes"> -{{$:/core/images/right-arrow}} +{{$:/core/images/chevron-right}} <$reveal type="match" state=<> text="yes" default="""$default-popup-state$"""> <$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="no"> -{{$:/core/images/down-arrow}} +{{$:/core/images/chevron-down}}
-
+
<$transclude tiddler=<> subtiddler=<>> <$transclude tiddler="$:/core/images/plugin-generic-$type$"/>
-
+

''<$view field="description"><$view field="title"/>'' $disabledMessage$

diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid index b7f84a3c6..3287819cf 100644 --- a/core/ui/ControlPanel/Modals/AddPlugins.tid +++ b/core/ui/ControlPanel/Modals/AddPlugins.tid @@ -2,12 +2,18 @@ title: $:/core/ui/ControlPanel/Modals/AddPlugins subtitle: {{$:/core/images/download-button}} {{$:/language/ControlPanel/Plugins/Add/Caption}} \define install-plugin-button() -<$button> +
+<$button class={{{ [get[original-title]get[version]then[tc-reinstall]] tc-btn-invisible tc-install-plugin +[join[ ]] }}}> <$action-sendmessage $message="tm-load-plugin-from-library" url={{!!url}} title={{$(assetInfo)$!!original-title}}/> +{{$:/core/images/download-button}} <$list filter="[get[original-title]get[version]]" variable="installedVersion" emptyMessage="""{{$:/language/ControlPanel/Plugins/Install/Caption}}"""> {{$:/language/ControlPanel/Plugins/Reinstall/Caption}} +
+
+<$reveal stateTitle=<> stateField="contains-javascript" type="match" text="yes">{{$:/language/ControlPanel/Plugins/PluginWillRequireReload}} +
\end \define popup-state-macro() @@ -17,29 +23,29 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ \define display-plugin-info(type) <$set name="popup-state" value=<>>
-
+
<$reveal type="nomatch" state=<> text="yes"> <$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="yes"> -{{$:/core/images/right-arrow}} +{{$:/core/images/chevron-right}} <$reveal type="match" state=<> text="yes"> <$button class="tc-btn-invisible tc-btn-dropdown" set=<> setTo="no"> -{{$:/core/images/down-arrow}} +{{$:/core/images/chevron-down}}
-
+
<$list filter="[has[icon]]" emptyMessage="""<$transclude tiddler="$:/core/images/plugin-generic-$type$"/>""">
-
-

<$view tiddler=<> field="description"/>

+
+

<$text text={{{ [get[name]] ~[get[original-title]split[/]last[1]] }}}/>: <$view tiddler=<> field="description"/>

<$view tiddler=<> field="original-title"/>

<$view tiddler=<> field="version"/>
-
+
<>
@@ -76,7 +82,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
-<$list filter="[all[tiddlers+shadows]tag[$:/tags/RemoteAssetInfo]server-url{!!url}original-plugin-type[$type$]search:author,description,original-title,readme,title{$:/temp/RemoteAssetSearch/$(currentTiddler)$}sort[description]]" variable="assetInfo"> +<$list filter="[all[tiddlers+shadows]tag[$:/tags/RemoteAssetInfo]server-url{!!url}original-plugin-type[$type$]search:author,description,original-title,readme,title{$:/temp/RemoteAssetSearch/$(currentTiddler)$}sort[title]sort[name]]" variable="assetInfo"> <>
diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid index 806301f01..4b5ab5d4b 100644 --- a/core/ui/EditTemplate/fields.tid +++ b/core/ui/EditTemplate/fields.tid @@ -58,12 +58,12 @@ $value={{$:/temp/newfieldvalue}}/> <$fieldmangler>
-<> +<>  <$edit-text tiddler="$:/temp/newfieldname" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} focusPopup=<> class="tc-edit-texteditor tc-popup-handle" tabindex={{$:/config/EditTabIndex}}/> - -<$button popup=<> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Field/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Field/Dropdown/Caption}}>{{$:/core/images/down-arrow}} +  +<$button popup=<> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Field/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Field/Dropdown/Caption}}>{{$:/core/images/down-arrow}}  <$reveal state=<> type="nomatch" text="" default="">
<$set name="tv-show-missing-links" value="yes"> @@ -73,7 +73,7 @@ $value={{$:/temp/newfieldvalue}}/>
<$list filter="[!is[shadow]!is[system]fields[]search:title{$:/temp/newfieldname}sort[]] -created -creator -draft.of -draft.title -modified -modifier -tags -text -title -type" variable="currentField"> <$link to=<>> -<> +<$text text=<>/>
@@ -81,7 +81,7 @@ $value={{$:/temp/newfieldvalue}}/>
<$list filter="[fields[]search:title{$:/temp/newfieldname}sort[]] -[!is[shadow]!is[system]fields[]]" variable="currentField"> <$link to=<>> -<> +<$text text=<>/> @@ -90,7 +90,7 @@ $value={{$:/temp/newfieldvalue}}/> <$edit-text tiddler="$:/temp/newfieldvalue" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} class="tc-edit-texteditor" tabindex={{$:/config/EditTabIndex}}/> - +  <$macrocall $name="new-field"/> diff --git a/core/ui/PageTemplate/pluginreloadwarning.tid b/core/ui/PageTemplate/pluginreloadwarning.tid index d7aa21fe4..4ac44ddc9 100644 --- a/core/ui/PageTemplate/pluginreloadwarning.tid +++ b/core/ui/PageTemplate/pluginreloadwarning.tid @@ -3,7 +3,7 @@ tags: $:/tags/PageTemplate \define lingo-base() $:/language/ -<$list filter="[has[plugin-type]haschanged[]!plugin-type[import]limit[1]]"> +<$list filter="[{$:/status/RequireReloadDueToPluginChange}match[yes]]"> <$reveal type="nomatch" state="$:/temp/HidePluginWarning" text="yes"> diff --git a/core/ui/SideBar/Open.tid b/core/ui/SideBar/Open.tid index 6ee386770..14e53ed40 100644 --- a/core/ui/SideBar/Open.tid +++ b/core/ui/SideBar/Open.tid @@ -6,7 +6,7 @@ caption: {{$:/language/SideBar/Open/Caption}} \define lingo-base() $:/language/CloseAll/ \define drop-actions() -<$action-listops $tiddler="$:/StoryList" $subfilter="+[insertbefore:currentTiddler]"/> +<$action-listops $tiddler=<> $subfilter="+[insertbefore:currentTiddler]"/> \end \define placeholder() diff --git a/core/wiki/config/OfficialPluginLibrary.tid b/core/wiki/config/OfficialPluginLibrary.tid index ccbaf94dc..39717937d 100644 --- a/core/wiki/config/OfficialPluginLibrary.tid +++ b/core/wiki/config/OfficialPluginLibrary.tid @@ -1,6 +1,6 @@ title: $:/config/OfficialPluginLibrary tags: $:/tags/PluginLibrary -url: https://tiddlywiki.com/library/v5.1.19/index.html +url: https://tiddlywiki.com/library/v5.1.22/index.html caption: {{$:/language/OfficialPluginLibrary}} {{$:/language/OfficialPluginLibrary/Hint}} diff --git a/core/wiki/config/PerformanceInstrumentation.tid b/core/wiki/config/PerformanceInstrumentation.tid index e4220f287..ccae6842e 100644 --- a/core/wiki/config/PerformanceInstrumentation.tid +++ b/core/wiki/config/PerformanceInstrumentation.tid @@ -1,2 +1,2 @@ title: $:/config/Performance/Instrumentation -text: yes +text: no diff --git a/core/wiki/config/RegisterPluginTypes.multids b/core/wiki/config/RegisterPluginTypes.multids new file mode 100644 index 000000000..f0e52acd5 --- /dev/null +++ b/core/wiki/config/RegisterPluginTypes.multids @@ -0,0 +1,7 @@ +title: $:/config/RegisterPluginType/ + +plugin: yes +theme: no +language: no +info: no +import: no diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid index 7d1ea80ea..7602793f1 100644 --- a/core/wiki/macros/toc.tid +++ b/core/wiki/macros/toc.tid @@ -28,7 +28,7 @@ tags: $:/tags/Macro \end -\define toc(tag,sort:"",itemClassFilter:" ") +\define toc(tag,sort:"",itemClassFilter:"") <$macrocall $name="toc-body" tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> /> \end @@ -87,7 +87,7 @@ tags: $:/tags/Macro <$macrocall $name="toc-linked-expandable-body" tag=<> sort=<> itemClassFilter=<> exclude=<> path=<>/> \end -\define toc-expandable(tag,sort:"",itemClassFilter:" ",exclude,path) +\define toc-expandable(tag,sort:"",itemClassFilter:"",exclude,path) <$vars tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}> <$set name="excluded" filter="""[enlist<__exclude__>] [<__tag__>]""">
    diff --git a/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid index 6070d5d32..1bfabebd2 100644 --- a/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid +++ b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid @@ -1,27 +1,45 @@ +created: 20190809095728085 +modified: 20190809123445125 title: Releasing a new version of TiddlyWiki +type: text/vnd.tiddlywiki -# Verify the version numbers in [[$:/config/OfficialPluginLibrary]] (both in `editions/tw5.com` and `editions/prerelease/tiddlers/system`) +!! Preparation on master + +# Ensure the new release banner image is up to date +# Update ''master'' with changes from ''tiddlywiki-com'' +# Verify the version numbers in [[$:/config/OfficialPluginLibrary]] in `editions/tw5.com` # Move the latest release note from the prerelease edition into the tw5.com edition # Adjust the release date and the ''released'' field of the latest release tiddler (eg, [[Release 5.1.3]]) # Ensure [[TiddlyWiki Releases]] has the new version as the default tab # Adjust the modified time of HelloThere -# Make sure ''Jermolene/TiddlyWiki5'' is fully committed +# Make sure ''master'' is fully committed + +!! Update Readmes + # Edit `package.json` to the new version number -# Run `../build.jermolene.github.io/readme-bld.sh` to build the readme files -# Commit the new readme files in `TiddlyWiki5` +# Run `./bin/readme-bld.sh` to build the readme files +# Commit the new readme files to ''master'' # Restore `package.json` to the previous version number -# Run `../build.jermolene.github.io/verbump "5.1.3"` (substituting the correct version number) to update the version number, assign it a tag -# Run `../build.jermolene.github.io/npm-publish.sh` to publish the release to npm -# Update the `package.json` for `build.jermolene.github.io` to the new version + +!! Make New Release + +# Run `./bin/verbump "5.1.3"` (substituting the correct version number) to update the version number, assign it a tag +# Run `./bin/npm-publish.sh` to publish the release to npm # Verify that the new release of TiddlyWiki is available at https://www.npmjs.org/package/tiddlywiki -# Change current directory to the `build.jermolene.github.io` directory -# Run `npm install` to install the correct version of TiddlyWiki -# Change current directory to the `TiddlyWiki5` directory -# Run `../build.jermolene.github.io/bld.sh` to build the content files -# Verify that the files in the `jermolene.github.io` directory are correct -# Run `../build.jermolene.github.io/github-push.sh` to push the new files to GitHub + +!! Update tiddlywiki.com release + +# Update ''tiddlywiki-com'' from ''master'' and push to ~GitHub + +!! Cleaning Up + # Tweet the release with the text "TiddlyWiki v5.x.x released to https://tiddlywiki.com #newtiddlywikirelease" -# Preparation for the next release: -## Adjust version number in [[$:/config/OfficialPluginLibrary]] (both in `editions/tw5.com` and `editions/prerelease/tiddlers/system`) and [[$:/config/LocalPluginLibrary]] -## Adjust version number in https://github.com/Jermolene/build.jermolene.github.io in `prerelease-bld.sh`, `bld.sh` and `make-library-bld.sh` +!! Preparation for the next release in ''master'' + +# Adjust version number in `package.json` +# Adjust version number in `bin/build-site.sh` +# Adjust version number in [[$:/config/OfficialPluginLibrary]] (both in `editions/tw5.com` and `editions/prerelease/tiddlers/system`) and [[$:/config/LocalPluginLibrary]] +# Adjust new release banner +# Create the release note for the new release +# Commit changes to ''master'' and push to ~GitHub diff --git a/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid b/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid index 662fbdf41..78230c40e 100644 --- a/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid +++ b/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid @@ -1,8 +1,8 @@ +created: 20190809094421578 +modified: 20190809104210288 title: Releasing new content for TiddlyWiki +type: text/vnd.tiddlywiki -# Change current directory to the `TiddlyWiki5` directory -# Run `../build.jermolene.github.io/bld.sh` to build the content files -# Run `../build.jermolene.github.io/readme-bld.sh` to build the readmes -# Commit the readmes to `TiddlyWiki5` and `build.jermolene.github.io` if necessary -# Verify that the files in the `jermolene.github.io` directory are correct -# Run `../build.jermolene.github.io/github-push.sh` to push the new files to GitHub +To update https://tiddlywiki.com with new content, make a Pull Request with the updated tiddlers to the `tiddlywiki-com` branch. As soon as the PR is merged, the [[Continuous Deployment]] system will automatically rebuild the site. + +Note that the PR should only include updates within the `editions` folder of the repo. \ No newline at end of file diff --git a/editions/dev/tiddlers/from Heigele and Jurke/Syncadaptor.tid b/editions/dev/tiddlers/from Heigele and Jurke/Syncadaptor.tid index c488b7712..377bc47e5 100644 --- a/editions/dev/tiddlers/from Heigele and Jurke/Syncadaptor.tid +++ b/editions/dev/tiddlers/from Heigele and Jurke/Syncadaptor.tid @@ -7,4 +7,4 @@ title: Syncadaptor A module with ``module-type: syncadaptor`` provides functionality to get a list of tiddlers (this list is provided as ~SkinnyTiddlers, which are normal tiddlers without the text field) and to load, save and delete single tiddlers. A syncadaptor can also provide functions to login and logout so that syncadaptor modules can be used to synchronize tiddlers with a remote server. -The syncer module only uses one syncadaptor and honours a special [[system tiddler|System Tiddlers]] [[$:/config/SyncFilter]] containing a [[filter string|Tags and Filter Mechanism]]. Tiddlers matching this filter string are not synced with a syncadapter. \ No newline at end of file +The syncer module only uses one syncadaptor and honours a special [[system tiddler|System Tiddlers]] [[$:/config/SyncFilter]] containing a [[filter string|Tags and Filter Mechanism]]. Tiddlers matching this filter string are not saved to the server with a syncadapter. It uses the [[WebServer API|https://tiddlywiki.com/#WebServer%20API%3A%20Get%20All%20Tiddlers]] to load modified tiddlers from the server, which returns only non-system tiddlers. \ No newline at end of file diff --git a/editions/prerelease/tiddlers/Release 5.1.22.tid b/editions/prerelease/tiddlers/Release 5.1.22.tid new file mode 100644 index 000000000..ea0cfdfec --- /dev/null +++ b/editions/prerelease/tiddlers/Release 5.1.22.tid @@ -0,0 +1,32 @@ +caption: 5.1.22 +created: 20190910152413608 +modified: 20190910152413608 +tags: ReleaseNotes +title: Release 5.1.22 +type: text/vnd.tiddlywiki + +//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.21...v5.1.22]]// + +! Major Improvements + +Plugins [[can now|https://github.com/Jermolene/TiddlyWiki5/pull/4259]] be loaded or deleted dynamically, without requiring a reload -- as long as they don't contain any ~JavaScript modules. Plugins that require a reload are indicated in the plugin chooser in [[$:/ControlPanel]]. + +! Translation Improvements + +* Improved Dutch translation + +! Hackability Improvements + +* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/1150c87edb7478af6cc943eb0ef52fdf3051c121]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/8c894612914e21cf941a1daa953538c28ce91d8e]]) new `[is[binary]]` operand for the [[is Operator]] +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/68163684a2e57108e160295e445c194268b873c5]] usage of `publishFilter` in save templates -- see SavingMechanism + +! Bug Fixes + +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/4243]] problem with the [[GitLab saver|Saving to a Git service]] + +! Contributors + +[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: + +* [[@gernert|https://github.com/gernert]] +* [[@Janno|https://github.com/Janno]] diff --git a/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid b/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid index 88301fd3e..d32a95711 100644 --- a/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid +++ b/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid @@ -1,6 +1,6 @@ title: $:/config/LocalPluginLibrary tags: $:/tags/PluginLibrary -url: http://127.0.0.1:8080/prerelease/library/v5.1.20/index.html +url: http://127.0.0.1:8080/prerelease/library/v5.1.22/index.html caption: {{$:/language/OfficialPluginLibrary}} (Prerelease Local) A locally installed version of the official ~TiddlyWiki plugin library at tiddlywiki.com for testing and debugging. //Requires a local web server to share the library// diff --git a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid index 7a687e363..9b2794ef0 100644 --- a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid +++ b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid @@ -1,6 +1,6 @@ title: $:/config/OfficialPluginLibrary tags: $:/tags/PluginLibrary -url: https://tiddlywiki.com/prerelease/library/v5.1.20/index.html +url: https://tiddlywiki.com/prerelease/library/v5.1.22/index.html caption: {{$:/language/OfficialPluginLibrary}} (Prerelease) The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team. diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid index 682dad792..a1fa201dc 100644 --- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid +++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid @@ -7,15 +7,3 @@ This is a pre-release build of TiddlyWiki, [[also available in empty form|https:

    <$text text=<>/>

    <$transclude mode="block"/> - -! Features held back for later release - -These unfinished features are included in this prerelease build, but are not planned for inclusion in the next release. - -* <$button> -<$action-setfield $tiddler="$:/view" text="stacked"/> -Set "Stacked" story view - <$button> -<$action-setfield $tiddler="$:/view" text="classic"/> -Revert - diff --git a/editions/test/tiddlers/tests/test-utils.js b/editions/test/tiddlers/tests/test-utils.js index fd924e1bf..860cc4d51 100644 --- a/editions/test/tiddlers/tests/test-utils.js +++ b/editions/test/tiddlers/tests/test-utils.js @@ -25,6 +25,26 @@ describe("Utility tests", function() { expect(psa(" [[Tidd\u00a0ler8]] two ")).toEqual(["Tidd\u00a0ler8","two"]); }); + it("should handle stringifying a string array", function() { + var str = $tw.utils.stringifyList; + expect(str([])).toEqual(""); + expect(str(["Tiddler8"])).toEqual("Tiddler8"); + expect(str(["Tiddler8 "])).toEqual("[[Tiddler8 ]]"); + expect(str(["A+B", "A-B", "A=B"])).toEqual("A+B A-B A=B"); + expect(str(["A B"])).toEqual("[[A B]]"); + // Starting special characters aren't treated specially, + // even though this makes a list incompatible with a filter parser. + expect(str(["+T", "-T", "~T", "=T", "$T"])).toEqual("+T -T ~T =T $T"); + expect(str(["A", "", "B"])).toEqual("A B"); + }); + + it("stringifyList shouldn't interfere with setting variables to negative numbers", function() { + var wiki = new $tw.Wiki(); + wiki.addTiddler({title: "test", text: "<$set name=X filter='\"-7\"'>{{{ [add[2]] }}}"}); + // X shouldn't be wrapped in brackets. If it is, math filters will treat it as zero. + expect(wiki.renderTiddler("text/plain","test")).toBe("-5"); + }); + it("should handle formatting a date string", function() { var fds = $tw.utils.formatDateString, // nov is month: 10! diff --git a/editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae.tid b/editions/tw5.com/tiddlers/community/resources/Font Awesome 5 Free SVGs for TiddlyWiki by morosanuae.tid 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.tid @@ -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}} 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/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 diff --git a/editions/tw5.com/tiddlers/features/StartupActions.tid b/editions/tw5.com/tiddlers/features/StartupActions.tid index c6ababfba..3b5583f47 100644 --- a/editions/tw5.com/tiddlers/features/StartupActions.tid +++ b/editions/tw5.com/tiddlers/features/StartupActions.tid @@ -10,7 +10,7 @@ TiddlyWiki executes any ActionWidgets found in tiddlers with the following syste * <> (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"> diff --git a/editions/tw5.com/tiddlers/filters/is.tid b/editions/tw5.com/tiddlers/filters/is.tid index bec256edf..b18dffe42 100644 --- a/editions/tw5.com/tiddlers/filters/is.tid +++ b/editions/tw5.com/tiddlers/filters/is.tid @@ -1,5 +1,5 @@ created: 20140410103123179 -modified: 20190225130632157 +modified: 20190916151432497 tags: [[Filter Operators]] [[Common Operators]] [[Negatable Operators]] title: is Operator type: text/vnd.tiddlywiki @@ -16,6 +16,7 @@ The parameter <<.place C>> is one of the following fundamental categories: |!Category |!Matches any tiddler title that... | |^`current` |is the [[current tiddler|Current Tiddler]] | |^`image` |has an image ContentType | +|^`binary` |has a binary ContentType | |^`missing` |does not exist (other than possibly as a shadow tiddler), regardless of whether there are any links to it | |^`orphan` |has no [[hard links|Hard and Soft Links]] to it | |^`shadow` |is a [[shadow tiddler|ShadowTiddlers]], regardless of whether it has been overridden with a non-shadow tiddler | diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid index c5342909f..8eb1a6672 100644 --- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid +++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid @@ -1,6 +1,6 @@ created: 20130822170200000 list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]] [[HelloThumbnail - TWEUM2017]] -modified: 20181220163418974 +modified: 20190910152313608 tags: TableOfContents title: HelloThere type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SyncPollingInterval.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SyncPollingInterval.tid new file mode 100644 index 000000000..7a3c5ca52 --- /dev/null +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SyncPollingInterval.tid @@ -0,0 +1,13 @@ +created: 20190903192324700 +modified: 20190903192324700 +tags: [[Hidden Settings]] +title: Hidden Setting: Sync Polling Interval +type: text/vnd.tiddlywiki + +Specifies the interval at which [[Syncadaptor|https://tiddlywiki.com/dev/#Syncadaptor]] synchronizes tiddlers between the server and the browser. + +Defaults to "60000" (60 * 1000 ms = 1 min). + +Changing needs restart to take effect. + +$:/config/SyncPollingInterval diff --git a/editions/tw5.com/tiddlers/images/New Release Banner.jpg b/editions/tw5.com/tiddlers/images/New Release Banner.jpg index dd31b43f0..c9a4d7e17 100644 Binary files a/editions/tw5.com/tiddlers/images/New Release Banner.jpg and b/editions/tw5.com/tiddlers/images/New Release Banner.jpg differ diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-rename-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-rename-tiddler.tid new file mode 100644 index 000000000..f97a9aaee --- /dev/null +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-rename-tiddler.tid @@ -0,0 +1,14 @@ +caption: tm-rename-tiddler +created: 20190909133618113 +modified: 20190909133618113 +tags: Messages navigator-message +title: WidgetMessage: tm-rename-tiddler +type: text/vnd.tiddlywiki + +The `tm-rename-tiddler` message renames a tiddler by deleting it and recreating it with a new title. The rename tiddler message requires the following properties on the `event` object: + +|!Name |!Description | +|from |Current title of tiddler | +|to |New title of tiddler | + +The rename tiddler message is usually generated with the ButtonWidget and is handled by the NavigatorWidget. diff --git a/editions/prerelease/tiddlers/Release 5.1.20.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.20.tid similarity index 99% rename from editions/prerelease/tiddlers/Release 5.1.20.tid rename to editions/tw5.com/tiddlers/releasenotes/Release 5.1.20.tid index 2babb8d9f..a56247222 100644 --- a/editions/prerelease/tiddlers/Release 5.1.20.tid +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.20.tid @@ -1,6 +1,7 @@ caption: 5.1.20 -created: 20181220163418974 -modified: 20190305165612365 +created: 20190809141328809 +modified: 20190809141328809 +released: 20190809141328809 tags: ReleaseNotes title: Release 5.1.20 type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.21.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.21.tid new file mode 100644 index 000000000..d1df30a41 --- /dev/null +++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.21.tid @@ -0,0 +1,46 @@ +caption: 5.1.21 +created: 20190910152313608 +modified: 20190910152313608 +released: 20190910152313608 +tags: ReleaseNotes +title: Release 5.1.21 +type: text/vnd.tiddlywiki + +//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.20...v5.1.21]]// + +This is a bug fix release that resolves issues introduced in the recent [[Release 5.1.20]]. + +!! Bug Fixes + +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/a170210069bbec265992b365a61e0722b480ab1d]] crash with ActionDeleteFieldWidget and a missing ''tiddler'' attribute +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/4087]] edge cases where some tiddler lists were not valid when interpreted as a filter +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/471b73158a887d2f060194741739c1da8b5d44d8]] problem with too many alerts when upgrading a wiki containing an overwritten core module +* [[Reverted|https://github.com/Jermolene/TiddlyWiki5/commit/83386f34b50a9d93171df133957d489b5de629ef]] inadvertently switching on performance instrumentation +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/4218]] bug with WikiText within field names +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/dd09266b467173e45d75c172b2e82fd542f682fe]] problem with classes in the [[Table-of-Contents Macros]] +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/4203]] missing foreground colour for buttons with class `tc-btn-invisible` +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/4227]] whitespace around field editor inputs +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/bb036ced933ecb36f5d93693fb4f6e7aa2748df7]] layout problems with the [[translators edition|Translate TiddlyWiki into your language]] +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/996ee52cf9f5e15d95deaf0acf4206959d34432a]] crash with the [[External Attachments Plugin]] on Windows +* [[Removed|https://github.com/Jermolene/TiddlyWiki5/pull/4245]] inconsistent shadow for tag pills in the sidebar +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/4247]] regression with the [[field Operator]] and blank operands +* [[Reverted|https://github.com/Jermolene/TiddlyWiki5/pull/4249]] erroneous change in v5.1.20 in the way that lists are stringified +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/4189]] the ''Open'' sidebar tab to use the `tv-story-list` variable +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/4255]] problem [[saving to GitLab|Saving to a Git service]] + +!! Node.js Bug Fixes + +* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/4174]] bug with [[customised tiddler file naming|Customising Tiddler File Naming]] + +! Contributors + +[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: + +* [[@bimlas|https://github.com/bimlas]] +* [[@BurningTreeC|https://github.com/BurningTreeC]] +* [[@flibbles|https://github.com/flibbles]] +* [[@heronils|https://github.com/heronils]] +* [[@hoelzro|https://github.com/hoelzro]] +* [[@markstegeman|https://github.com/markstegeman]] +* [[@StefanSTFG|https://github.com/StefanSTFG]] +* [[@xcazin|https://github.com/xcazin]] 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]]// 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. 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 ae39eca7d..98119804c 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,10 +1,10 @@ created: 20181002131215403 -modified: 20181003174025431 +modified: 20190903094711346 tags: [[WebServer API]] title: WebServer API: Get All Tiddlers type: text/vnd.tiddlywiki -Gets an array of all raw tiddlers, excluding the ''text'' field. +Gets an array of all raw non-system tiddlers, excluding the ''text'' field. ``` GET /recipes/default/tiddlers.json @@ -19,4 +19,4 @@ Response: * 200 OK *> `Content-Type: application/json` -*> Body: array of tiddlers in [[TiddlyWeb JSON tiddler format]] +*> Body: array of all non-system tiddlers in [[TiddlyWeb JSON tiddler format]] diff --git a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid index 87ef7b936..454124a61 100644 --- a/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/CheckboxWidget.tid @@ -53,20 +53,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]] - - -' /> - 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 | diff --git a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid index a44a84eb4..754f05598 100644 --- a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid @@ -1,7 +1,7 @@ caption: reveal created: 20131024141900000 jeremy: tiddlywiki -modified: 20190704145627537 +modified: 20190910150520583 tags: Widgets title: RevealWidget type: text/vnd.tiddlywiki @@ -36,13 +36,13 @@ The content of the `<$reveal>` widget is displayed according to the rules given |position |The position used for the popup when the type is ''popup''. Can be ''left'', ''above'', ''aboveright'', ''right'', ''belowleft'' or ''below'' | |positionAllowNegative |Set to "yes" to prevent computed popup positions from being clamped to be above zero | |default |Default value to use when the state tiddler is missing | -|animate |Set to "yes" to animate opening and closure (defaults to "no") | +|animate |Set to "yes" to animate opening and closure (defaults to "no"; requires "retain" to be set to "yes") | |retain |Set to "yes" to force the content to be retained even when hidden (defaults to "no") | <<.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]]. This is useful for edge-cases where titles may contain characters that are used to denote Tiddler fields or indices (`!!`, `##`)""">> -<<.tip """Retaining the content when hidden can give poor performance since the hidden content requires refresh processing even though it is not displayed. On the other hand, the content can be revealed much more quickly. Note that setting ''animate="yes"'' will also force ''retain="yes"''""">> +<<.tip """Retaining the content when hidden can give poor performance since the hidden content requires refresh processing even though it is not displayed. On the other hand, the content can be revealed much more quickly. Note that setting ''animate="yes"'' will also require ''retain="yes"''""">> ! Examples diff --git a/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid index f53b423a1..d491a8700 100644 --- a/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid +++ b/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid @@ -85,6 +85,6 @@ Filtered attribute values are indicated with triple curly braces around a [[Filt This example shows how to add a prefix to a value: ``` -<$text text={{{ []addPrefix[$:/myprefix/]] }}}> +<$text text={{{ [addprefix[$:/myprefix/]] }}} /> ``` diff --git a/languages/ca-ES/ControlPanel.multids b/languages/ca-ES/ControlPanel.multids index f02196f3a..ce761302b 100644 --- a/languages/ca-ES/ControlPanel.multids +++ b/languages/ca-ES/ControlPanel.multids @@ -85,19 +85,31 @@ Plugins/Themes/Caption: Temes Plugins/Themes/Hint: Connectors del tema Saving/Caption: Desa Saving/DownloadSaver/AutoSave/Description: Permet que el gestor de baixades desi automàticament -Saving/DownloadSaver/AutoSave/Hint: Habiliteu el desat automàtic pel gestor de baixades +Saving/DownloadSaver/AutoSave/Hint: Activa el desat automàtic pel gestor de baixades Saving/DownloadSaver/Caption: Gestor de baixades Saving/DownloadSaver/Hint: Aquesta configuració s’aplica al gestor de baixades compatible amb HTML5 Saving/General/Hint: Aquests valors s'apliquen a tots els gestors de baixades carregats -Saving/GitHub/Branch: Branca destí a on desar (per omissió és `master`) +Saving/GitHub/Branch: Branca destinació a on desar (per omissió és `master`) Saving/GitHub/Caption: Gestor de baixades de ~GitHub Saving/GitHub/Description: Aquests valors només s’utilitzen quan es desa a ~ GitHub Saving/GitHub/Filename: Nom del fitxer destinació (per exemple, `index.html`) Saving/GitHub/Password: Contrasenya, clau OAUTH o clau d'accés personal Saving/GitHub/Path: Ruta al fitxer destinació (per exemple, `/wiki/`) -Saving/GitHub/Repo: Repositori destí (per exemple, `Jermolene/TiddlyWiki5`) -Saving/GitHub/ServerURL: URL del servidor (per omissió és `https://api.github.com`) +Saving/GitHub/Repo: Repositori destinació (per exemple, `Jermolene/TiddlyWiki5`) +Saving/GitHub/ServerURL: URL del servidor (per omissió és `https://api.github.com`) Saving/GitHub/UserName: Nom d'usuari +Saving/GitService/Branch: Branca destinació a on desar +Saving/GitService/CommitMessage: Desat per TiddlyWiki +Saving/GitService/Description: Aquests paràmetres només s'utilitzen quan es desa a <> +Saving/GitService/Filename: Nom del fitxer destinació (per exemple `index.html`) +Saving/GitService/GitHub/Caption: Gestor de baixades de ~GitHub +Saving/GitService/GitHub/Password: Contrasenya, clau OAUTH o clau d'accés personal (veieu els detalls a la [[pàgina d'ajuda del GitHub|https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line]] ) +Saving/GitService/GitLab/Caption: Gestor de baixades de ~GitLab +Saving/GitService/GitLab/Password: Clau d'accés personal de l'API (veieu els detalls a la [[pàgina d'ajuda del GitLab|https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html]] ) +Saving/GitService/Path: Ruta del fitxer destinació (e.g. `/wiki/`) +Saving/GitService/Repo: Repositori destinació (e.g. `Jermolene/TiddlyWiki5`) +Saving/GitService/ServerURL: URL de l'API del servidor +Saving/GitService/UserName: NomDUsuari Saving/Heading: S'està desant Saving/Hint: Configuració que s’utilitza per desar tot el TiddlyWiki com a un únic fitxer amb un mòdul de desar Saving/TiddlySpot/Advanced/Heading: Paràmetres avançats @@ -116,7 +128,7 @@ Settings/AutoSave/Disabled/Description: No desis els canvis de forma automàtica Settings/AutoSave/Enabled/Description: Desa els canvis de forma automàtica Settings/AutoSave/Hint: Desa els canvis de forma automàtica mentre s'està editant Settings/CamelCase/Caption: Enllaços wiki tipus CamelCase -Settings/CamelCase/Description: Habilita l'enllaç automàtic de ~CamelCase +Settings/CamelCase/Description: Activa l'enllaç automàtic de ~CamelCase Settings/CamelCase/Hint: Podeu desactivar l’enllaç automàtic de les frases ~CamelCase globalment. Cal que es torni a carregar per tenir efecte Settings/Caption: Paràmetres Settings/DefaultMoreSidebarTab/Caption: Pestanya Més de la barra lateral per omissió @@ -134,8 +146,8 @@ Settings/InfoPanelMode/Sticky/Description: El tauler d’informació del Tiddler Settings/LinkToBehaviour/Caption: Comportament d'obertura del tiddler Settings/LinkToBehaviour/InsideRiver/Hint: Navegació des de //dins de// la cronologia Settings/LinkToBehaviour/OpenAbove: Obre per sobre del tiddler actual -Settings/LinkToBehaviour/OpenAtBottom: Obriu a la part inferior de la cronologia -Settings/LinkToBehaviour/OpenAtTop: Obriu a la part superior de la cronologia +Settings/LinkToBehaviour/OpenAtBottom: Obre a la part inferior de la cronologia +Settings/LinkToBehaviour/OpenAtTop: Obre a la part superior de la cronologia Settings/LinkToBehaviour/OpenBelow: Obre per sota del tiddler actual Settings/LinkToBehaviour/OutsideRiver/Hint: Navegació des de //fora de//la cronologia Settings/MissingLinks/Caption: Enllaços Wiki @@ -144,19 +156,19 @@ Settings/MissingLinks/Hint: Escolliu si voleu enllaçar els tiddlers que encara Settings/NavigationAddressBar/Caption: Barra d'adreces de navegació Settings/NavigationAddressBar/Hint: Comportament de la barra d'adreces en navegar cap a un tiddler: Settings/NavigationAddressBar/No/Description: No actualitzis la barra d'adreces -Settings/NavigationAddressBar/Permalink/Description: Inclou el tiddler destí -Settings/NavigationAddressBar/Permaview/Description: Inclou el tiddler destí i la seqùència actual +Settings/NavigationAddressBar/Permalink/Description: Inclou el tiddler destinació +Settings/NavigationAddressBar/Permaview/Description: Inclou el tiddler destinació i la seqùència actual Settings/NavigationHistory/Caption: Històrial de navegació Settings/NavigationHistory/Hint: Actualitza l'històrial del navegador en navegar cap a un tiddler: Settings/NavigationHistory/No/Description: No actualitzis la cronologia Settings/NavigationHistory/Yes/Description: Actualitza la cronologia Settings/NavigationPermalinkviewMode/Caption: Mode enllaç permanent/vista permanent -Settings/NavigationPermalinkviewMode/CopyToClipboard/Description: Copieu l’URL de l'enllaç permanent/vista permanent al portapapers +Settings/NavigationPermalinkviewMode/CopyToClipboard/Description: Copia l’URL de l'enllaç permanent/vista permanent al portapapers Settings/NavigationPermalinkviewMode/Hint: Trieu com es gestiona l'enllaç permanent/vista permanent Settings/NavigationPermalinkviewMode/UpdateAddressBar/Description: Actualitzeu la barra d’adreça amb l’URL de l'enllaç permanent/vista permanent -Settings/PerformanceInstrumentation/Caption: Instrumentació del rendiment -Settings/PerformanceInstrumentation/Description: Habilita la instrumentació del rendiment -Settings/PerformanceInstrumentation/Hint: Mostra estadístiques de rendiment a la consola del desenvolupador del navegador. Cal tornar-ho a carregar per que tingui efecte +Settings/PerformanceInstrumentation/Caption: Instruments del rendiment +Settings/PerformanceInstrumentation/Description: Activa els instruments del rendiment +Settings/PerformanceInstrumentation/Hint: Mostra les estadístiques de rendiment a la consola del desenvolupador del navegador. Cal tornar-ho a carregar per que tingui efecte Settings/TitleLinks/Caption: Títols dels Tiddlers Settings/TitleLinks/Hint: Mostra opcionalment els títols de tiddler com a enllaços Settings/TitleLinks/No/Description: No mostris els títols dels tiddlers com a enllaços diff --git a/languages/ca-ES/Docs/PaletteColours.multids b/languages/ca-ES/Docs/PaletteColours.multids index 0247f21d2..83a739405 100644 --- a/languages/ca-ES/Docs/PaletteColours.multids +++ b/languages/ca-ES/Docs/PaletteColours.multids @@ -20,7 +20,7 @@ dragger-foreground: Primer plà de l'arrossegador dropdown-background: Fons de la llista desplegable dropdown-border: Vora de la llista desplegable dropdown-tab-background: Fons de la pestanya de la llista desplegable -dropdown-tab-background-selected: Fons de la pestanya de la llista desplegable per les etiquetes seleccionades +dropdown-tab-background-selected: Fons de la pestanya de la llista desplegable per les pestanyes seleccionades dropzone-background: Fons de la zona d'aterratge external-link-background: Fons de l'enllaç extern external-link-background-hover: Fons de la bafarada de l'enllaç extern @@ -33,7 +33,7 @@ message-background: Fons de la capsa de text message-border: Vora de la capsa de text message-foreground: Primer plà de la capsa de text modal-backdrop: Zona d'aterratge dels diàlegs modals -modal-background: Fons dels diàlegs modals per les etiquetes seleccionades +modal-background: Fons dels diàlegs modals modal-border: Vora dels diàlegs modals modal-footer-background: Fons del peu dels diàlegs modals modal-footer-border: Vora del peu dels diàlegs modals @@ -55,23 +55,23 @@ sidebar-foreground-shadow: Ombra del primer plà de la barra lateral sidebar-muted-foreground: Primer plà de la barra lateral silenciada sidebar-muted-foreground-hover: Primer plà de la bafarada de la barra lateral silenciada sidebar-tab-background: Fons de la pestanya de la barra lateral -sidebar-tab-background-selected: Fons de la pestanya de la barra lateral per les etiquetes seleccionades -sidebar-tab-border: Vora de la pestanya de la barra lateraletiqueta -sidebar-tab-border-selected: Vora de la pestanya de la barra lateral per les etiquetes seleccionadesetiqueta +sidebar-tab-background-selected: Fons de la pestanya de la barra lateral per les pestanyes seleccionades +sidebar-tab-border: Vora de la pestanya de la barra lateral +sidebar-tab-border-selected: Vora de la pestanya de la barra lateral per les pestanyes seleccionades sidebar-tab-divider: Divisor de la pestanya de la barra lateral sidebar-tab-foreground: Primer plà de la pestanya de la barra lateral -sidebar-tab-foreground-selected: Primer plà de la pestanya de la barra lateral per les etiquetes seleccionades +sidebar-tab-foreground-selected: Primer plà de la pestanya de la barra lateral per les pestanyes seleccionades sidebar-tiddler-link-foreground: Primer plà de l'enllaç del tiddler de la barra lateral sidebar-tiddler-link-foreground-hover: Primer plà de la bafarada de l'enllaç del tiddler de la barra lateral site-title-foreground: Primer pla del títol del lloc static-alert-foreground: Primer plà de l'avís estàtic tab-background: Fons de la pestanya -tab-background-selected: Fons de la pestanya per les etiquetes seleccionades +tab-background-selected: Fons de la pestanya per les pestanyes seleccionades tab-border: Vora de la pestanya -tab-border-selected: Vora de la pestanya per les etiquetes seleccionades +tab-border-selected: Vora de la pestanya per les pestanyes seleccionades tab-divider: Divisor de la pestanya tab-foreground: Primer plà de la pestanya -tab-foreground-selected: Primer plà de la pestanya per les etiquetes seleccionades +tab-foreground-selected: Primer plà de la pestanya per les pestanyes seleccionades table-border: Vora de la taula table-footer-background: Fons del peu de la taula table-header-background: Fons de la capçalera de la taula diff --git a/languages/ca-ES/EditTemplate.multids b/languages/ca-ES/EditTemplate.multids index 6af9caad0..452715f03 100644 --- a/languages/ca-ES/EditTemplate.multids +++ b/languages/ca-ES/EditTemplate.multids @@ -20,7 +20,7 @@ Tags/Add/Placeholder: nom de l'etiqueta Tags/Dropdown/Caption: llista d'etiquetes Tags/Dropdown/Hint: Mostra la llista d'etiquetes Title/BadCharacterWarning: Avís: eviteu qualsevol dels caràcters <> al títol d'un tiddler -Title/Exists/Prompt: El tiddler destí ja existeix +Title/Exists/Prompt: El tiddler destinació ja existeix Title/References/Prompt: Les referències següents cap aquest tiddler no s'actualitzaran automàticament: Title/Relink/Prompt: Actualitza ''<$text text=<>/>'' cap a ''<$text text=<>/>'' a les //etiquetes// i a la //lista// de camps d'altres tiddlers Type/Delete/Caption: suprimeix el tipus de contingut diff --git a/languages/ca-ES/Misc.multids b/languages/ca-ES/Misc.multids index dac9291f7..12e82a572 100644 --- a/languages/ca-ES/Misc.multids +++ b/languages/ca-ES/Misc.multids @@ -33,10 +33,10 @@ Error/SavingToTWEdit: S'ha produït un error en desar a TWEdit Error/WhileSaving: S'ha produït un error en desar Error/XMLHttpRequest: Codi d'error XMLHttpRequest InternalJavaScriptError/Hint: Bé, això és compromès. Es recomana que reinicieu TiddlyWiki actualitzant el navegador -InternalJavaScriptError/Title: Error de JavaScript intern +InternalJavaScriptError/Title: S'ha produït un error intern de JavaScript InvalidFieldName: Hi ha caràcters il·legals al nom del camp "<$text text=<>/>". Els camps només poden utilitzar minúscules, digits i els caràcters subratllat (`_`), guió (`-`) i punt (`.`) LazyLoadingWarning:

    S'està tractant de carregar contingut extern de ''<$text text={{!!_canonical_uri}}/>''

    Si aquest missatge no desapareix, o bé el tipus de contingut del tiddler no coincideix amb el tipus de contingut extern o bé esteu utilitzant un navegador que no admet contingut extern per als wikis carregats com a fitxers independents. Mireu https://tiddlywiki.com/#ExternalText

    -LoginToTiddlySpace: Inicieu sessió a TiddlySpace +LoginToTiddlySpace: Inicieu la sessió a TiddlySpace Manager/Controls/FilterByTag/None: (cap) Manager/Controls/FilterByTag/Prompt: Filtra per etiqueta: Manager/Controls/Order/Prompt: Ordre invers diff --git a/languages/fr-FR/ControlPanel.multids b/languages/fr-FR/ControlPanel.multids index 2813e6092..d2f61d283 100644 --- a/languages/fr-FR/ControlPanel.multids +++ b/languages/fr-FR/ControlPanel.multids @@ -87,16 +87,19 @@ Saving/DownloadSaver/Caption: Enregistreur de téléchargement Saving/DownloadSaver/Hint: Ces paramètres s'appliquent à l'enregistreur de téléchargement compatible HTML5 Saving/General/Caption: Général Saving/General/Hint: Ces paramètres s'appliquent à tous les enregistreurs chargés -Saving/Hint: Paramètres pour enregistrer le ~TiddlyWiki complet dans un seul fichier, via un module enregistreur -Saving/GitHub/Branch: Branche cible dans laquelle enregistrer (`master` par défaut) -Saving/GitHub/Caption: Enregistreur ~GitHub -Saving/GitHub/Description: Ces paramètres ne sont utilisés que pour l'enregistrement sur ~GitHub -Saving/GitHub/ServerURL: URL du serveur (`https://api.github.com` par défaut) -Saving/GitHub/Filename: Nom du fichier cible (par ex. `index.html`) -Saving/GitHub/Password: Mot de passe, jeton OAUTH, ou //personal access token// -Saving/GitHub/Path: Chemin vers le fichier cible (par ex. `/wiki/`) -Saving/GitHub/Repo: //Repository// cible (par ex. `Jermolene/TiddlyWiki5`) -Saving/GitHub/UserName: Nom d'utilisateur +Saving/Hint: Paramètres pour enregistrer l'intégralité du TiddlyWiki dans un seul fichier, selon le module d'enregistrement choisi +Saving/GitService/Branch: Branche cible où doit s'effectuer l'enregistrement +Saving/GitService/CommitMessage: Enregistré depuis TiddlyWiki +Saving/GitService/Description: Ces paramètres ne sont utilisés que pour l'enregistrement sur <> +Saving/GitService/Filename: Nom du fichier cible (par ex. `index.html`) +Saving/GitService/Path: Chemin vers le fichier cible (par ex. `/wiki/`) +Saving/GitService/Repo: //Repository// cible (par ex. `Jermolene/TiddlyWiki5`) +Saving/GitService/ServerURL: URL du serveur d'API +Saving/GitService/UserName: Nom d'utilisateur +Saving/GitService/GitHub/Caption: Enregistreur ~GitHub +Saving/GitService/GitHub/Password: Mot de passe, jeton OAUTH, ou //personal access token// (voir [[GitHub help page|https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line]] pour de plus amples détails) +Saving/GitService/GitLab/Caption: Enregistreur ~GitLab +Saving/GitService/GitLab/Password: //Personal access token// pour cette API (voir [[GitLab help page|https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html]] pour de plus amples details) Saving/TiddlySpot/Advanced/Heading: Paramètres avancés Saving/TiddlySpot/BackupDir: Dossier des //sauvegardes// Saving/TiddlySpot/Backups: Sauvegardes diff --git a/languages/fr-FR/Misc.multids b/languages/fr-FR/Misc.multids index c18ce3cb6..4fa120e08 100644 --- a/languages/fr-FR/Misc.multids +++ b/languages/fr-FR/Misc.multids @@ -68,6 +68,6 @@ TagManager/Count/Heading: Total TagManager/Icon/Heading: Icône TagManager/Info/Heading: Info TagManager/Tag/Heading: Tag -Tiddler/DateFormat: DD MMM YYYY à hhhmm +Tiddler/DateFormat: DD MMM YYYY à hhh0mm UnsavedChangesWarning: Vos dernières modifications n'ont pas été sauvegardées dans votre TiddlyWiki Yes: Oui diff --git a/languages/nl-NL/Buttons.multids b/languages/nl-NL/Buttons.multids index 44b7a66af..16f594dec 100644 --- a/languages/nl-NL/Buttons.multids +++ b/languages/nl-NL/Buttons.multids @@ -171,6 +171,7 @@ Timestamp/Off/Caption: tijdstempels zijn uit Timestamp/Off/Hint: Werk tijdstempels niet bij als tiddlers veranderd zijn Timestamp/On/Caption: tijdstempels zijn aan Timestamp/On/Hint: Werk tijdstempels bij als tiddlers veranderd zijn +ToggleSidebar/Hint: 'Toggle' de sideba Transcludify/Caption: transclusie Transcludify/Hint: Zet selectie tussen accolades Underline/Caption: onderstreept diff --git a/languages/nl-NL/ControlPanel.multids b/languages/nl-NL/ControlPanel.multids index 75770bc41..e3fa522fc 100644 --- a/languages/nl-NL/ControlPanel.multids +++ b/languages/nl-NL/ControlPanel.multids @@ -47,6 +47,8 @@ LoadedModules/Hint: Dit zijn de nu geladen tiddler modules gekoppeld aan hun bro Palette/Caption: Palet Palette/Editor/Clone/Caption: kloon Palette/Editor/Clone/Prompt: Het wordt aanbevolen dit schaduwpalet te klonen alvorens het te wijzigen. +Palette/Editor/Delete/Hint: verwijder deze invoer van het huidige palet +Palette/Editor/Names/External/Show: Toon namen van kleuren die niet tot het huiddige palet behoren Palette/Editor/Prompt: Wijzigen Palette/Editor/Prompt/Modified: Dit schaduwpalet is gewijzigd Palette/Editor/Reset/Caption: reset @@ -89,6 +91,27 @@ Saving/DownloadSaver/Caption: Opslagmodule Saving/DownloadSaver/Hint: Deze instellingen gelden voor de HTML5 compatibele opslagmodule Saving/General/Caption: Algemeen Saving/General/Hint: Deze instellingen gelden voor alle geladen opslagmodules +Saving/GitHub/Branch: 'Tak' (branch) voor opslaan (standaard `master`) +Saving/GitHub/Caption: ~GitHub opslagmodule +Saving/GitHub/Description: Deze instellingen worden alleen gebruikt voor opslaan bij ~GitHub +Saving/GitHub/Filename: Bestandsnaam van doelbestand (b.v. `index.html`) + +Saving/GitHub/Password: Wachtwoord, OAUTH token of persoonlijk toegangstoken +Saving/GitHub/Path: Pad naar doelbestand (b.v. `/wiki/`) +Saving/GitHub/Repo: Opslagplaats (b.v. `Jermolene/TiddlyWiki5`) +Saving/GitHub/ServerURL: Server URL (standaard `https://api.github.com`) +Saving/GitHub/UserName: Gebruikersnaam +Saving/GitService/Branch: Doeltak (branch) voor opslaan +Saving/GitService/CommitMessage: Opgeslagen door TiddlyWiki +Saving/GitService/Description: Deze instellingen worden alleen gebruikt bij opslaan naar <> +Saving/GitService/Filename: Bestandsnaam van doelbestand (b.v. `index.html`) +Saving/GitService/GitHub/Password: Wachtwoord, OAUTH token, of persoonlijk toegangs-token (zie [[GitHub help-pagina|https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line]] voor details) +Saving/GitService/GitLab/Caption: ~GitLab opslagmodule +Saving/GitService/GitLab/Password: Persoonlijk toegangs-token voor API (zie [[GitLab help-pagina|https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html]] voor details) + +Saving/GitService/Path: Pad naar doelbestand (b.v. `/wiki/`) +Saving/GitService/Repo: Opslagdoel (b.v. `Jermolene/TiddlyWiki5`) +Saving/GitService/UserName: Gebruikersnaam Saving/Heading: Opslaan Saving/Hint: Instellingen voor opslaan van de gehele TiddlyWiki als één bestand via een opslagmodule Saving/TiddlySpot/Advanced/Heading: Geavanceerde instellingen @@ -141,6 +164,7 @@ Settings/NavigationHistory/Caption: Navigeer-geschiedenis Settings/NavigationHistory/Hint: Werk de browsergeschiedenis bij als er naar een tiddler genavigeerd wordt: Settings/NavigationHistory/No/Description: Werk de browsergeschiedenis niet bij Settings/NavigationHistory/Yes/Description: Werk de browsergeschiedenis bij +Settings/NavigationPermalinkviewMode/Caption: Permalink/permaview modus Settings/NavigationPermalinkviewMode/CopyToClipboard/Description: Kopieer permalink/permaview URL naar klembord Settings/NavigationPermalinkviewMode/Hint: Kies hoe permalink/permaview wordt behandeld: Settings/NavigationPermalinkviewMode/UpdateAddressBar/Description: Werk de adresbalk bij met permalink/permaview URL diff --git a/languages/nl-NL/Fields.multids b/languages/nl-NL/Fields.multids index 14556084d..16b2f41d1 100644 --- a/languages/nl-NL/Fields.multids +++ b/languages/nl-NL/Fields.multids @@ -14,6 +14,7 @@ draft.of: Voor concepttiddlers; bevat de titel van de te maken tiddler draft.title: Voor concepttiddlers; bevat de voorgestelde titel van de tiddler footer: De voettekst van een 'wizard' hack-to-give-us-something-to-compare-against: Een tijdelijk opslagveld dat in [[$:/core/templates/static.content]] gebruikt wordt +hide-body: Als 'yes' ingevuld is, wordt de tekst van de tiddler niet weergegeven icon: De titel van de pictogramtiddler die met deze tiddler gekoppeld is library: Als 'yes' ingevuld is, dient de tiddler als JavaScript-bibliotheek opgeslagen te worden list: Een geordende lijst van tiddlertitels gekoppeld met een tiddler @@ -31,5 +32,6 @@ subtitle: De tekst van de ondertitel van een wizard tags: Een lijst van labels gekoppeld met een tiddler text: De tekst van een tiddler title: De unieke naam van een tiddler +toc-link: Als 'no' ingevuld is, is de tiddler geen link meer in de Inhoudsopgave type: Inhoudstype van een tiddler version: Versieinformatie van een plugin diff --git a/languages/nl-NL/Filters.multids b/languages/nl-NL/Filters.multids index c60073392..ff54435f4 100644 --- a/languages/nl-NL/Filters.multids +++ b/languages/nl-NL/Filters.multids @@ -8,6 +8,7 @@ Orphans: Weestiddlers OverriddenShadowTiddlers: Overschreven schaduwtiddlers RecentSystemTiddlers: Onlangs gewijzigde tiddlers inclusief systeemtiddlers RecentTiddlers: Onlangs gewijzigde tiddlers +SessionTiddlers: Tiddlers gewijzigf nadat de wiki geleaden werd ShadowTiddlers: Schaduwtiddlers StoryList: Tiddlers in de 'story river' behalve <$text text="$:/AdvancedSearch"/> SystemTags: Systeemlabels diff --git a/languages/nl-NL/Help/deletetiddlers.tid b/languages/nl-NL/Help/deletetiddlers.tid new file mode 100644 index 000000000..5c38bcf62 --- /dev/null +++ b/languages/nl-NL/Help/deletetiddlers.tid @@ -0,0 +1,8 @@ +title: $:/language/Help/deletetiddlers +description: Deletes a group of tiddlers + +<<.from-version "5.1.20">> Verwijdert een gefilterde groep tiddlers. + +``` +--deletetiddlers +``` diff --git a/languages/nl-NL/Help/savewikifolder.tid b/languages/nl-NL/Help/savewikifolder.tid new file mode 100644 index 000000000..06ea81fd8 --- /dev/null +++ b/languages/nl-NL/Help/savewikifolder.tid @@ -0,0 +1,19 @@ +title: $:/language/Help/savewikifolder +description: Saves a wiki to a new wiki folder + +<<.from-version "5.1.20">> Slaat de wiki als een wiki-folder op inclusief tiddlers, plugins en configuratie: + +``` +--savewikifolder [] +``` + +* De doel wiki folder moet leeg zijn of niet bestaan +* Het filter geeft aan welke tiddlers opgeslagen worden. Het filter is optioneel; standaard is `[all[tiddlers]]` +* Plugins uit de officiële plugin-bibliotheek worden vervangen door referenties naar deze plugins in het `tiddlywiki.info` bestand +* Andere plugins worden uitgepakt in hun eigen folder + +Kan worden gebruikt om een TiddlyWiki HTML-bestand in een wiki-folder om te zetten: + +``` +tiddlywiki --load ./mywiki.html --savewikifolder ./mywikifolder +``` diff --git a/languages/nl-NL/Import.multids b/languages/nl-NL/Import.multids index 526c84e6d..f08222ad7 100644 --- a/languages/nl-NL/Import.multids +++ b/languages/nl-NL/Import.multids @@ -17,5 +17,7 @@ Upgrader/Plugins/Suppressed/Incompatible: Geblokkeerde plugin (incompatibel of v Upgrader/Plugins/Suppressed/Version: Geblokkeerde plugin (te importeren <> ouder dan bestaande <>) Upgrader/Plugins/Upgraded: Plugin opgewaardeerd van <> naar <> Upgrader/State/Suppressed: Geblokkeerde tijdelijke statustiddler +Upgrader/System/Alert: Je staat op het punt om om een tiddler te importeren die een 'core module' tiddler zal overschrijven. Dit wordt niet aanbevolen daar het systeem instabiel kan worden Upgrader/System/Suppressed: Geblokkeerde systeemtiddler +Upgrader/System/Warning: 'Core module' tiddler Upgrader/ThemeTweaks/Created: Gemigreerde thema-aanpassing van <$text text=<>/> diff --git a/languages/zh-Hans/ControlPanel.multids b/languages/zh-Hans/ControlPanel.multids index a43cf7f43..c771a8a3c 100644 --- a/languages/zh-Hans/ControlPanel.multids +++ b/languages/zh-Hans/ControlPanel.multids @@ -74,6 +74,7 @@ Plugins/NoInformation/Hint: 未提供信息 Plugins/NotInstalled/Hint: 尚未安装此插件 Plugins/OpenPluginLibrary: 开启插件程式库 Plugins/ClosePluginLibrary: 关闭插件程式库 +Plugins/PluginWillRequireReload: （需要重新加载） Plugins/Plugins/Caption: 插件 Plugins/Plugins/Hint: 插件 Plugins/Reinstall/Caption: 重新安装 @@ -92,15 +93,18 @@ Saving/DownloadSaver/Hint: 这些设置适用于兼容 HTML5 的下载保存模 Saving/General/Caption: 通用 Saving/General/Hint: 这些设置适用于所有已载入的保存模块 Saving/Hint: 用于通过保存模块将整个 TiddlyWiki 保存为单个文件的设置 -Saving/GitHub/Branch: 用于保存的目标分支 (默认值为 `master`) -Saving/GitHub/Caption: ~GitHub 保存模块 -Saving/GitHub/Description: 这些设定仅用于保存到 ~GitHub -Saving/GitHub/ServerURL: 服务器网址 (默认值为 `https://api.github.com`) -Saving/GitHub/Filename: 目标文件的文件名称 (例如，`index.html`) -Saving/GitHub/Password: 密码、OAUTH 令牌，或个人存取的令牌 -Saving/GitHub/Path: 目标文件的路径 (例如，`/wiki/`) -Saving/GitHub/Repo: 目标存储库 (例如，`Jermolene/TiddlyWiki5`) -Saving/GitHub/UserName: 用户名称 +Saving/GitService/Branch: 用于保存的目标分支 +Saving/GitService/CommitMessage: 由 TiddlyWiki 保存 +Saving/GitService/Description: 这些设置仅用于保存至 <> +Saving/GitService/Filename: 目标文件的文件名称 (例如，`index.html`) +Saving/GitService/Path: 目标文件的路径 (例如，`/wiki/`) +Saving/GitService/Repo: 目标存储库 (例如，`Jermolene/TiddlyWiki5`) +Saving/GitService/ServerURL: 服务器 API 网址 +Saving/GitService/UserName: 用户名称 +Saving/GitService/GitHub/Caption: ~GitHub 保存模块 +Saving/GitService/GitHub/Password: 密码、OAUTH 令牌，或个人存取令牌 (详见 [[GitHub 帮助页面|https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line]]) +Saving/GitService/GitLab/Caption: ~GitLab 保存模块 +Saving/GitService/GitLab/Password: 个人存取令牌的 API (详见 [[GitLab 帮助页面|https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html]]) Saving/TiddlySpot/Advanced/Heading: 高级设置 Saving/TiddlySpot/BackupDir: 备份文件夹 Saving/TiddlySpot/Backups: 备份 diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids index 84f927808..00b5799bf 100644 --- a/languages/zh-Hans/Misc.multids +++ b/languages/zh-Hans/Misc.multids @@ -59,7 +59,7 @@ MissingTiddler/Hint: 佚失条目 "<$text text=<>/>" - 点击 {{ No: 否 OfficialPluginLibrary: ~TiddlyWiki 官方插件程式库 OfficialPluginLibrary/Hint: 此为在 tiddlywiki.com 的 ~TiddlyWiki 官方插件程式库。由核心团队维护的插件、主题和语言包。 -PluginReloadWarning: 请保存 {{$:/core/ui/Buttons/save-wiki}} 并刷新页面 {{$:/core/ui/Buttons/refresh}} 允许更改插件才能生效 +PluginReloadWarning: 请保存 {{$:/core/ui/Buttons/save-wiki}} 并刷新页面 {{$:/core/ui/Buttons/refresh}} ，使 ~JavaScript 插件的更改生效 RecentChanges/DateFormat: YYYY年0MM月0DD日 SystemTiddler/Tooltip: 此为系统条目 SystemTiddlers/Include/Prompt: 包括系统条目 diff --git a/languages/zh-Hant/ControlPanel.multids b/languages/zh-Hant/ControlPanel.multids index 664ad121a..f94406edb 100644 --- a/languages/zh-Hant/ControlPanel.multids +++ b/languages/zh-Hant/ControlPanel.multids @@ -74,6 +74,7 @@ Plugins/NoInformation/Hint: 未提供資訊 Plugins/NotInstalled/Hint: 尚未安裝此插件 Plugins/OpenPluginLibrary: 開啟插件程式庫 Plugins/ClosePluginLibrary: 關閉插件程式庫 +Plugins/PluginWillRequireReload: （需要重新載入） Plugins/Plugins/Caption: 插件 Plugins/Plugins/Hint: 插件 Plugins/Reinstall/Caption: 重新安裝 @@ -92,15 +93,18 @@ Saving/DownloadSaver/Hint: 這些設定適用於相容 HTML5 的下載儲存模 Saving/General/Caption: 通用 Saving/General/Hint: 這些設定適用於所有已載入的儲存模組 Saving/Hint: 用於通過儲存模組將整個 TiddlyWiki 儲存為單個檔案的設定 -Saving/GitHub/Branch: 用於儲存的目標分支 (預設值為 `master`) -Saving/GitHub/Caption: ~GitHub 儲存模組 -Saving/GitHub/Description: 這些設定僅用於儲存到 ~GitHub -Saving/GitHub/ServerURL: 伺服器網址 (預設值為 `https://api.github.com`) -Saving/GitHub/Filename: 目標檔案的檔案名稱 (例如，`index.html`) -Saving/GitHub/Password: 密碼、OAUTH 令牌，或個人存取的令牌 -Saving/GitHub/Path: 目標檔案的路徑 (例如，`/wiki/`) -Saving/GitHub/Repo: 目標存儲庫 (例如，`Jermolene/TiddlyWiki5`) -Saving/GitHub/UserName: 使用者名稱 +Saving/GitService/Branch: 用於儲存的目標分支 +Saving/GitService/CommitMessage: 由 TiddlyWiki 儲存 +Saving/GitService/Description: 這些設定僅用於儲存至 <> +Saving/GitService/Filename: 目標檔案的檔案名稱 (例如，`index.html`) +Saving/GitService/Path: 目標檔案的路徑 (例如，`/wiki/`) +Saving/GitService/Repo: 目標存儲庫 (例如，`Jermolene/TiddlyWiki5`) +Saving/GitService/ServerURL: 伺服器 API 網址 +Saving/GitService/UserName: 使用者名稱 +Saving/GitService/GitHub/Caption: ~GitHub 儲存模組 +Saving/GitService/GitHub/Password: 密碼、OAUTH 令牌，或個人存取令牌 (詳見 [[GitHub 說明頁面|https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line]]) +Saving/GitService/GitLab/Caption: ~GitLab 儲存模組 +Saving/GitService/GitLab/Password: 個人存取令牌的 API (詳見 [[GitLab 說明頁面|https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html]]) Saving/TiddlySpot/Advanced/Heading: 進階設定 Saving/TiddlySpot/BackupDir: 備份資料夾 Saving/TiddlySpot/Backups: 備份 diff --git a/languages/zh-Hant/Misc.multids b/languages/zh-Hant/Misc.multids index c583a2ed1..31569388b 100644 --- a/languages/zh-Hant/Misc.multids +++ b/languages/zh-Hant/Misc.multids @@ -59,7 +59,7 @@ MissingTiddler/Hint: 佚失條目 "<$text text=<>/>" - 點擊 {{ No: 否 OfficialPluginLibrary: ~TiddlyWiki 官方插件程式庫 OfficialPluginLibrary/Hint: 此為在 tiddlywiki.com 的 ~TiddlyWiki 官方插件程式庫。由核心團隊維護的插件、主題和語言包。 -PluginReloadWarning: 請儲存 {{$:/core/ui/Buttons/save-wiki}} 並刷新頁面 {{$:/core/ui/Buttons/refresh}} 允許更改插件才能生效 +PluginReloadWarning: 請儲存 {{$:/core/ui/Buttons/save-wiki}} 並刷新頁面 {{$:/core/ui/Buttons/refresh}} ，使 ~JavaScript 插件的更改生效 RecentChanges/DateFormat: YYYY年0MM月0DD日 SystemTiddler/Tooltip: 此為系統條目 SystemTiddlers/Include/Prompt: 包括系統條目 diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index ba9949937..60c397c11 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -357,3 +357,19 @@ Adam Sherwood, @admls, 2019/01/27 Joshua Fontany, @joshuafontany, 2019/03/07 Irene Castaños, @jdjdjdjdjdjd, 2019/03/11 + +Dong Zhihong, @donmor, 2019/05/29 + +Joshua Stubbs, @LordRatte, 2019/05/31 + +Robin Munn, @rmunn, 2019/06/16 + +Mark Kerrigan, @markkerrigan, 2019/08/24 + +Stefan Schuster-Teupke, @StefanSTFG, 2019/08/26 + +Nils-Hero Lindemann, @heronils, 2019/08/26 + +Mark Stegeman, @markstegeman, 2019/08/31 + +Jan-Oliver Kaiser, @janno, 2019/09/06 diff --git a/package.json b/package.json index 807303164..2fc00f9ee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tiddlywiki", "preferGlobal": "true", - "version": "5.1.20-prerelease", + "version": "5.1.22-prerelease", "author": "Jeremy Ruston ", "description": "a non-linear personal web notebook", "contributors": [ diff --git a/plugins/tiddlywiki/async/plugin.info b/plugins/tiddlywiki/async/plugin.info index 701c3bd41..971160d1f 100644 --- a/plugins/tiddlywiki/async/plugin.info +++ b/plugins/tiddlywiki/async/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/async", - "description": "Wrapper for async.js by Caolan McMahon", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Async", + "description": "async.js library", + "author": "Caolan McMahon", "list": "readme license" } diff --git a/plugins/tiddlywiki/aws/plugin.info b/plugins/tiddlywiki/aws/plugin.info index 08ee1fd44..89f248824 100644 --- a/plugins/tiddlywiki/aws/plugin.info +++ b/plugins/tiddlywiki/aws/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/aws", - "description": "Tools for working with Amazon Web Services", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "AWS", + "description": "Amazon Web Services extensions and tools", "list": "readme setup commands lambda" } diff --git a/plugins/tiddlywiki/bibtex/plugin.info b/plugins/tiddlywiki/bibtex/plugin.info index 4b88be21e..d21b48844 100644 --- a/plugins/tiddlywiki/bibtex/plugin.info +++ b/plugins/tiddlywiki/bibtex/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/bibtex", + "name": "BibTeX", "description": "BibTeX importer", - "author": "Henrik Muehe and Mikola Lysenko, adapted by Jeremy Ruston", - "plugin-type": "plugin", + "author": "Henrik Muehe and Mikola Lysenko", "list": "readme license" } diff --git a/plugins/tiddlywiki/blog/plugin.info b/plugins/tiddlywiki/blog/plugin.info index a1b079ccc..cdc82558a 100644 --- a/plugins/tiddlywiki/blog/plugin.info +++ b/plugins/tiddlywiki/blog/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/blog", - "description": "Tools for using TiddlyWiki to publish blogs", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Blog", + "description": "Blog publishing tools", "list": "readme docs" } diff --git a/plugins/tiddlywiki/browser-sniff/plugin.info b/plugins/tiddlywiki/browser-sniff/plugin.info index 5ec4eefac..06e43726a 100644 --- a/plugins/tiddlywiki/browser-sniff/plugin.info +++ b/plugins/tiddlywiki/browser-sniff/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/browser-sniff", - "description": "Browser sniffing", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Browser Sniff", + "description": "Browser feature detection", "list": "readme usage" } diff --git a/plugins/tiddlywiki/browser-storage/plugin.info b/plugins/tiddlywiki/browser-storage/plugin.info index 68dd147d2..772236e44 100644 --- a/plugins/tiddlywiki/browser-storage/plugin.info +++ b/plugins/tiddlywiki/browser-storage/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/browser-storage", - "description": "Browser-based local storage", - "author": "Jeremy Ruston ", - "core-version": ">=5.0.0", + "name": "Browser Storage", + "description": "Local storage in the browser", "list": "readme settings" } diff --git a/plugins/tiddlywiki/cecily/plugin.info b/plugins/tiddlywiki/cecily/plugin.info index f18a47103..664e3bcba 100644 --- a/plugins/tiddlywiki/cecily/plugin.info +++ b/plugins/tiddlywiki/cecily/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/cecily", + "name": "Cecily", "description": "Zoomable storyview (Cecily)", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme" } diff --git a/plugins/tiddlywiki/classictools/plugin.info b/plugins/tiddlywiki/classictools/plugin.info index 0e63bdfcf..5a07f8106 100644 --- a/plugins/tiddlywiki/classictools/plugin.info +++ b/plugins/tiddlywiki/classictools/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/classictools", - "description": "TiddlyWiki Classic manipulation tools", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Classic Tools", + "description": "TiddlyWiki Classic tools", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-autocomplete/plugin.info b/plugins/tiddlywiki/codemirror-autocomplete/plugin.info index aae66a787..f46e5bdac 100755 --- a/plugins/tiddlywiki/codemirror-autocomplete/plugin.info +++ b/plugins/tiddlywiki/codemirror-autocomplete/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-autocomplete", - "description": "CodeMirror AddOn: Autocompletion", - "author": "JeremyRuston", + "name": "CodeMirror Autocomplete", + "description": "Autocompletion for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-closebrackets/plugin.info b/plugins/tiddlywiki/codemirror-closebrackets/plugin.info index c308d1045..a4eb8cac1 100755 --- a/plugins/tiddlywiki/codemirror-closebrackets/plugin.info +++ b/plugins/tiddlywiki/codemirror-closebrackets/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-closebrackets", - "description": "CodeMirror AddOn: Close Brackets", - "author": "JeremyRuston", + "name": "CodeMirror Close Brackets", + "description": "Close brackets for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-closetag/plugin.info b/plugins/tiddlywiki/codemirror-closetag/plugin.info index 81d404892..c8ec68505 100755 --- a/plugins/tiddlywiki/codemirror-closetag/plugin.info +++ b/plugins/tiddlywiki/codemirror-closetag/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-closetag", - "description": "CodeMirror AddOn: Auto-Close Tags", - "author": "JeremyRuston", + "name": "CodeMirror Close Tag", + "description": "Close tags automatically for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-fullscreen-editing/plugin.info b/plugins/tiddlywiki/codemirror-fullscreen-editing/plugin.info index e95e5cc29..89ba08df1 100755 --- a/plugins/tiddlywiki/codemirror-fullscreen-editing/plugin.info +++ b/plugins/tiddlywiki/codemirror-fullscreen-editing/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-fullscreen", - "description": "CodeMirror AddOn: Fullscreen Editing", - "author": "JeremyRuston", + "name": "CodeMirror Fullscreen", + "description": "Fullscreen editing for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-keymap-emacs/plugin.info b/plugins/tiddlywiki/codemirror-keymap-emacs/plugin.info index 7844a4932..519472a6c 100755 --- a/plugins/tiddlywiki/codemirror-keymap-emacs/plugin.info +++ b/plugins/tiddlywiki/codemirror-keymap-emacs/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-keymap-emacs", - "description": "CodeMirror Keymap: Emacs", - "author": "JeremyRuston", + "name": "CodeMirror Keymap Emacs", + "description": "Keymap compatible with Emacs for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-keymap-sublime-text/plugin.info b/plugins/tiddlywiki/codemirror-keymap-sublime-text/plugin.info index 5be49fd36..6f7ba6067 100755 --- a/plugins/tiddlywiki/codemirror-keymap-sublime-text/plugin.info +++ b/plugins/tiddlywiki/codemirror-keymap-sublime-text/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-keymap-sublime-text", - "description": "CodeMirror Keymap: Sublime Text", - "author": "JeremyRuston", + "name": "CodeMirror Keymap Sublime Text", + "description": "Keymap compatible with Sublime Text for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-keymap-vim/plugin.info b/plugins/tiddlywiki/codemirror-keymap-vim/plugin.info index 17770299c..0f5387d5c 100755 --- a/plugins/tiddlywiki/codemirror-keymap-vim/plugin.info +++ b/plugins/tiddlywiki/codemirror-keymap-vim/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-keymap-vim", - "description": "CodeMirror Keymap: Vim", - "author": "JeremyRuston", + "name": "CodeMirror Keymap Vim", + "description": "Keymap compatible with Vim for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-mode-css/plugin.info b/plugins/tiddlywiki/codemirror-mode-css/plugin.info index 115afed8c..e304dd256 100755 --- a/plugins/tiddlywiki/codemirror-mode-css/plugin.info +++ b/plugins/tiddlywiki/codemirror-mode-css/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-mode-css", - "description": "CodeMirror Mode: CSS Highlighting", - "author": "JeremyRuston", + "name": "CodeMirror Mode CSS", + "description": "CSS highlighting mode for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-mode-htmlembedded/plugin.info b/plugins/tiddlywiki/codemirror-mode-htmlembedded/plugin.info index a7eef49c6..a0f2f0528 100755 --- a/plugins/tiddlywiki/codemirror-mode-htmlembedded/plugin.info +++ b/plugins/tiddlywiki/codemirror-mode-htmlembedded/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-mode-htmlembedded", - "description": "CodeMirror Mode: Embedded-HTML Highlighting", - "author": "JeremyRuston", + "name": "CodeMirror Mode HTML Embedded", + "description": "Embedded HTML highlighting mode for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-mode-htmlmixed/plugin.info b/plugins/tiddlywiki/codemirror-mode-htmlmixed/plugin.info index 99d12fde9..a99c6e623 100755 --- a/plugins/tiddlywiki/codemirror-mode-htmlmixed/plugin.info +++ b/plugins/tiddlywiki/codemirror-mode-htmlmixed/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-mode-htmlmixed", - "description": "CodeMirror Mode: HTML Highlighting", - "author": "JeremyRuston", + "name": "CodeMirror Mode HTML Mixed", + "description": "HTML mixed highlighting mode for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-mode-javascript/plugin.info b/plugins/tiddlywiki/codemirror-mode-javascript/plugin.info index 6bbc03273..c4d39ee7b 100755 --- a/plugins/tiddlywiki/codemirror-mode-javascript/plugin.info +++ b/plugins/tiddlywiki/codemirror-mode-javascript/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-mode-javascript", - "description": "CodeMirror Mode: Javascript Highlighting", - "author": "JeremyRuston", + "name": "CodeMirror Mode JavaScript", + "description": "JavaScript highlighting mode for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-mode-markdown/plugin.info b/plugins/tiddlywiki/codemirror-mode-markdown/plugin.info index a9c8f1fd1..05593c4a1 100755 --- a/plugins/tiddlywiki/codemirror-mode-markdown/plugin.info +++ b/plugins/tiddlywiki/codemirror-mode-markdown/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-mode-markdown", - "description": "CodeMirror Mode: Markdown Highlighting", - "author": "JeremyRuston", + "name": "CodeMirror Mode Markdown", + "description": "Markdown highlighting mode for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/plugin.info b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/plugin.info index e58c0bab0..1d6244a81 100755 --- a/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/plugin.info +++ b/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-mode-x-tiddlywiki", - "description": "CodeMirror Mode: Tiddlywiki Classic Highlighting", - "author": "JeremyRuston", + "name": "CodeMirror Mode TiddlyWiki Classic", + "description": "Tiddlywiki Classic highlighting mode for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-mode-xml/plugin.info b/plugins/tiddlywiki/codemirror-mode-xml/plugin.info index 29ff6c7bc..35065d0cf 100755 --- a/plugins/tiddlywiki/codemirror-mode-xml/plugin.info +++ b/plugins/tiddlywiki/codemirror-mode-xml/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-mode-xml", - "description": "CodeMirror Mode: XML Highlighting", - "author": "JeremyRuston", + "name": "CodeMirror Mode XML", + "description": "XML highlighting mode for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror-search-replace/plugin.info b/plugins/tiddlywiki/codemirror-search-replace/plugin.info index 6f31daa04..15f10dfa5 100755 --- a/plugins/tiddlywiki/codemirror-search-replace/plugin.info +++ b/plugins/tiddlywiki/codemirror-search-replace/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror-search-replace", - "description": "CodeMirror AddOn: Search and Replace", - "author": "JeremyRuston", + "name": "CodeMirror Search and Replace", + "description": "Search and replace for CodeMirror", "list": "readme" } diff --git a/plugins/tiddlywiki/codemirror/plugin.info b/plugins/tiddlywiki/codemirror/plugin.info index bbe17c5af..739b9042f 100755 --- a/plugins/tiddlywiki/codemirror/plugin.info +++ b/plugins/tiddlywiki/codemirror/plugin.info @@ -1,6 +1,6 @@ { "title": "$:/plugins/tiddlywiki/codemirror", - "description": "CodeMirror _Editor", - "author": "JeremyRuston", + "name": "CodeMirror", + "description": "CodeMirror editor", "list": "readme usage keyboard license" } diff --git a/plugins/tiddlywiki/comments/plugin.info b/plugins/tiddlywiki/comments/plugin.info index 8be289f4b..8e99b6546 100644 --- a/plugins/tiddlywiki/comments/plugin.info +++ b/plugins/tiddlywiki/comments/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/comments", - "description": "Comments", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Comments", + "description": "Threaded tiddler comments", "list": "readme config" } diff --git a/plugins/tiddlywiki/d3/plugin.info b/plugins/tiddlywiki/d3/plugin.info index d6fc739eb..1c0b7095d 100644 --- a/plugins/tiddlywiki/d3/plugin.info +++ b/plugins/tiddlywiki/d3/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/d3", - "description": "D3: data visualisation", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "D3", + "description": "D3 data visualisation demo", "list": "readme" } diff --git a/plugins/tiddlywiki/dynaview/plugin.info b/plugins/tiddlywiki/dynaview/plugin.info index 7c90e3a53..e47f5ca9b 100644 --- a/plugins/tiddlywiki/dynaview/plugin.info +++ b/plugins/tiddlywiki/dynaview/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/dynaview", + "name": "DynaView", "description": "Dynamic scrolling and zooming effects", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme docs examples config" } diff --git a/plugins/tiddlywiki/evernote/plugin.info b/plugins/tiddlywiki/evernote/plugin.info index baf35156e..5aa63932c 100644 --- a/plugins/tiddlywiki/evernote/plugin.info +++ b/plugins/tiddlywiki/evernote/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/evernote", + "name": "Evernote", "description": "Evernote migration tools", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme docs" } diff --git a/plugins/tiddlywiki/external-attachments/plugin.info b/plugins/tiddlywiki/external-attachments/plugin.info index a2d4f9bea..5a294abcc 100644 --- a/plugins/tiddlywiki/external-attachments/plugin.info +++ b/plugins/tiddlywiki/external-attachments/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/external-attachments", - "description": "External attachment support for TiddlyDesktop et al.", - "author": "Jeremy Ruston", - "core-version": ">=5.0.0", + "name": "External Attachments", + "description": "External attachments for TiddlyDesktop", "list": "readme settings" } diff --git a/plugins/tiddlywiki/external-attachments/startup.js b/plugins/tiddlywiki/external-attachments/startup.js index 174f43ff2..4967921c5 100644 --- a/plugins/tiddlywiki/external-attachments/startup.js +++ b/plugins/tiddlywiki/external-attachments/startup.js @@ -26,15 +26,15 @@ exports.startup = function() { test_makePathRelative(); $tw.hooks.addHook("th-importing-file",function(info) { if(document.location.protocol === "file:" && info.isBinary && info.file.path && $tw.wiki.getTiddlerText(ENABLE_EXTERNAL_ATTACHMENTS_TITLE,"") === "yes") { - var locationPathParts = document.location.pathname.split("/").slice(0,-1), - filePathParts = info.file.path.split(/[\\\/]/mg).map(encodeURIComponent); +console.log("Wiki location",document.location.pathname) +console.log("File location",info.file.path) info.callback([ { title: info.file.name, type: info.type, "_canonical_uri": makePathRelative( - filePathParts.join("/"), - locationPathParts.join("/"), + info.file.path, + document.location.pathname, { useAbsoluteForNonDescendents: $tw.wiki.getTiddlerText(USE_ABSOLUTE_FOR_NON_DESCENDENTS_TITLE,"") === "yes", useAbsoluteForDescendents: $tw.wiki.getTiddlerText(USE_ABSOLUTE_FOR_DESCENDENTS_TITLE,"") === "yes" @@ -50,29 +50,47 @@ exports.startup = function() { }; /* -Given a source absolute path and a root absolute path, returns the source path expressed as a relative path from the root path. +Given a source absolute filepath and a root absolute path, returns the source filepath expressed as a relative filepath from the root path. + +sourcepath comes from the "path" property of the file object, with the following patterns: + /path/to/file.png for Unix systems + C:\path\to\file.png for local files on Windows + \\sharename\path\to\file.png for network shares on Windows +rootpath comes from document.location.pathname with urlencode applied with the following patterns: + /path/to/file.html for Unix systems + /C:/path/to/file.html for local files on Windows + /sharename/path/to/file.html for network shares on Windows */ function makePathRelative(sourcepath,rootpath,options) { options = options || {}; + // First we convert the source path from OS-dependent format to generic file:// format + if(options.isWindows || $tw.platform.isWindows) { + sourcepath = sourcepath.replace(/\\/g,"/"); + // If it's a local file like C:/path/to/file.ext then add a leading slash + if(sourcepath.charAt(0) !== "/") { + sourcepath = "/" + sourcepath; + } + // If it's a network share then remove one of the leading slashes + if(sourcepath.substring(0,2) === "//") { + sourcepath = sourcepath.substring(1); + } + } + // Split the path into parts var sourceParts = sourcepath.split("/"), rootParts = rootpath.split("/"), outputParts = []; - // Check that each path started with a slash - if(sourceParts[0] || rootParts[0]) { - throw "makePathRelative: both paths must be absolute"; - } + // urlencode the parts of the sourcepath + $tw.utils.each(sourceParts,function(part,index) { + sourceParts[index] = encodeURI(part); + }); // Identify any common portion from the start - var c = 1, + var c = 0, p; while(c < sourceParts.length && c < rootParts.length && sourceParts[c] === rootParts[c]) { c += 1; } - // Return "." if there's nothing left - if(c === sourceParts.length && c === rootParts.length ) { - return "." - } - // Use an absolute path if required - if((options.useAbsoluteForNonDescendents && c < rootParts.length) || (options.useAbsoluteForDescendents && c === rootParts.length)) { + // Use an absolute path if there's no common portion, or if specifically requested + if(c === 1 || (options.useAbsoluteForNonDescendents && c < rootParts.length) || (options.useAbsoluteForDescendents && c === rootParts.length)) { return sourcepath; } // Move up a directory for each directory left in the root @@ -87,25 +105,21 @@ function makePathRelative(sourcepath,rootpath,options) { } function test_makePathRelative() { - var msg = "makePathRelative test failed"; - if(makePathRelative("/Users/me/something","/Users/you/something") !== "../../me/something") { - throw msg; - } - if(makePathRelative("/Users/me/something","/Users/you/something",{useAbsoluteForNonDescendents: true}) !== "/Users/me/something") { - throw msg; - } - if(makePathRelative("/Users/me/something/else","/Users/me/something") !== "else") { - throw msg; - } - if(makePathRelative("/Users/me/something","/Users/me/something/new") !== "..") { - throw msg; - } - if(makePathRelative("/Users/me/something","/Users/me/something/new",{useAbsoluteForNonDescendents: true}) !== "/Users/me/something") { - throw msg; - } - if(makePathRelative("/Users/me/something","/Users/me/something") !== ".") { - throw msg; - } + var test = function(sourcepath,rootpath,result,options) { + if(makePathRelative(sourcepath,rootpath,options) !== result) { + throw "makePathRelative test failed: makePathRelative(" + sourcepath + "," + rootpath + "," + JSON.stringify(options) + ") is not equal to " + result; + } + }; + test("/Users/me/something/file.png","/Users/you/something","../../me/something/file.png"); + test("/Users/me/something/file.png","/Users/you/something","/Users/me/something/file.png",{useAbsoluteForNonDescendents: true}); + test("/Users/me/something/else/file.png","/Users/me/something","else/file.png"); + test("/Users/me/something/file.png","/Users/me/something/new","../file.png"); + test("/Users/me/something/file.png","/Users/me/something/new","/Users/me/something/file.png",{useAbsoluteForNonDescendents: true}); + test("/Users/me/something/file.png","/Users/me/something","file.png"); + test("C:\\Users\\me\\something\\file.png","/C:/Users/me/something","file.png",{isWindows: true}); + test("\\\\SHARE\\Users\\me\\something\\file.png","/SHARE/Users/me/somethingelse","../something/file.png",{isWindows: true}); + test("\\\\SHARE\\Users\\me\\something\\file.png","/C:/Users/me/something","/SHARE/Users/me/something/file.png",{isWindows: true}); } + })(); diff --git a/plugins/tiddlywiki/filesystem/filesystemadaptor.js b/plugins/tiddlywiki/filesystem/filesystemadaptor.js index 1b4ddf18f..a346a6606 100644 --- a/plugins/tiddlywiki/filesystem/filesystemadaptor.js +++ b/plugins/tiddlywiki/filesystem/filesystemadaptor.js @@ -53,7 +53,7 @@ FileSystemAdaptor.prototype.getTiddlerFileInfo = function(tiddler,callback) { // Otherwise, we'll need to generate it fileInfo = $tw.utils.generateTiddlerFileInfo(tiddler,{ directory: $tw.boot.wikiTiddlersPath, - pathFilters: this.wiki.getTiddlerText("$:/config/FileSystemPaths"), + pathFilters: this.wiki.getTiddlerText("$:/config/FileSystemPaths","").split("\n"), wiki: this.wiki }); $tw.boot.files[title] = fileInfo; diff --git a/plugins/tiddlywiki/filesystem/plugin.info b/plugins/tiddlywiki/filesystem/plugin.info index d98a42139..17cfe96c9 100644 --- a/plugins/tiddlywiki/filesystem/plugin.info +++ b/plugins/tiddlywiki/filesystem/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/filesystem", - "description": "Local filesystem syncadaptor", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Filesystem", + "description": "Synchronise changes to the local filesystem", "list": "readme" } diff --git a/plugins/tiddlywiki/github-fork-ribbon/plugin.info b/plugins/tiddlywiki/github-fork-ribbon/plugin.info index 12853a48f..fdef00d7e 100644 --- a/plugins/tiddlywiki/github-fork-ribbon/plugin.info +++ b/plugins/tiddlywiki/github-fork-ribbon/plugin.info @@ -1,6 +1,7 @@ { "title": "$:/plugins/tiddlywiki/github-fork-ribbon", - "description": "Corner ribbon", + "name": "GitHub Fork Ribbon", + "description": "GitHub-inspired corner ribbon", "author": "Simon Whitaker, adapted for TiddlyWiki by JeremyRuston", "list": "readme usage" } diff --git a/plugins/tiddlywiki/googleanalytics/plugin.info b/plugins/tiddlywiki/googleanalytics/plugin.info index 4754bca2a..7a23112c1 100644 --- a/plugins/tiddlywiki/googleanalytics/plugin.info +++ b/plugins/tiddlywiki/googleanalytics/plugin.info @@ -1,8 +1,7 @@ { "title": "$:/plugins/tiddlywiki/googleanalytics", - "description": "Google Analytics: website statistics", - "author": "JeremyRuston", + "name": "Google Analytics", + "description": "Website visitor statistics from Google", "contributor": "Sylvain Comte", - "core-version": ">=5.0.0", "list": "readme settings usage" } diff --git a/plugins/tiddlywiki/hammerjs/plugin.info b/plugins/tiddlywiki/hammerjs/plugin.info index 3aa05269c..77a4be4ad 100644 --- a/plugins/tiddlywiki/hammerjs/plugin.info +++ b/plugins/tiddlywiki/hammerjs/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/hammerjs", - "description": "HammerJS library by Jorik Tangelder (Eight Media)", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "HammerJS", + "description": "HammerJS touch gesture library", + "author": "Jorik Tangelder (Eight Media)", "list": "readme license" } diff --git a/plugins/tiddlywiki/help/plugin.info b/plugins/tiddlywiki/help/plugin.info index f43237a07..6e75aa3bc 100644 --- a/plugins/tiddlywiki/help/plugin.info +++ b/plugins/tiddlywiki/help/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/help", - "description": "Help panel for TiddlyWiki", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Help", + "description": "Floating help panel", "list": "readme" } diff --git a/plugins/tiddlywiki/highlight/plugin.info b/plugins/tiddlywiki/highlight/plugin.info index bcc1ffa69..663b0dc5f 100644 --- a/plugins/tiddlywiki/highlight/plugin.info +++ b/plugins/tiddlywiki/highlight/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/highlight", - "description": "Highlight.js: syntax highlighting", - "author": "JoaoBolila", - "core-version": ">=5.0.0", + "name": "Highlight", + "description": "Highlight.js syntax highlighting", + "author": "Joao Bolila", "list": "readme usage howto license" } diff --git a/plugins/tiddlywiki/innerwiki/plugin.info b/plugins/tiddlywiki/innerwiki/plugin.info index 07b1e550d..d574d4923 100644 --- a/plugins/tiddlywiki/innerwiki/plugin.info +++ b/plugins/tiddlywiki/innerwiki/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/innerwiki", - "description": "Innerwiki: programmable screenshots", - "author": "Jeremy Ruston", - "plugin-type": "plugin", + "name": "Innerwiki", + "description": "Innerwikis for screenshots and hacking", "list": "readme docs examples" } diff --git a/plugins/tiddlywiki/internals/plugin.info b/plugins/tiddlywiki/internals/plugin.info index 78634903c..e64ded56a 100644 --- a/plugins/tiddlywiki/internals/plugin.info +++ b/plugins/tiddlywiki/internals/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/internals", + "name": "Internals", "description": "Tools for exploring the internals of TiddlyWiki", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme" } diff --git a/plugins/tiddlywiki/jasmine/plugin.info b/plugins/tiddlywiki/jasmine/plugin.info index fdbb836dd..f46a8e1e9 100644 --- a/plugins/tiddlywiki/jasmine/plugin.info +++ b/plugins/tiddlywiki/jasmine/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/jasmine", - "description": "Jasmine: testing framework", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Jasmine", + "description": "Jasmine testing framework", "list": "readme" } diff --git a/plugins/tiddlywiki/jszip/plugin.info b/plugins/tiddlywiki/jszip/plugin.info index f3cf1789f..ee0d00145 100644 --- a/plugins/tiddlywiki/jszip/plugin.info +++ b/plugins/tiddlywiki/jszip/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/jszip", - "description": "Wrapper for JSZip by Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "JSZip", + "description": "JSZip library", + "author": "Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso", "list": "readme license" } diff --git a/plugins/tiddlywiki/katex/plugin.info b/plugins/tiddlywiki/katex/plugin.info index bf57322a1..13df252d8 100644 --- a/plugins/tiddlywiki/katex/plugin.info +++ b/plugins/tiddlywiki/katex/plugin.info @@ -1,8 +1,7 @@ { "title": "$:/plugins/tiddlywiki/katex", - "description": "KaTeX: mathematical typography", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "KaTeX", + "description": "KaTeX library for mathematical typography", "list": "readme usage", "library-version": "v0.10.2" } diff --git a/plugins/tiddlywiki/markdown/plugin.info b/plugins/tiddlywiki/markdown/plugin.info index 293d26359..b95685831 100755 --- a/plugins/tiddlywiki/markdown/plugin.info +++ b/plugins/tiddlywiki/markdown/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/markdown", - "description": "Markdown parser", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Markdown", + "description": "Markdown parser based on markdown-js", "list": "readme usage" } diff --git a/plugins/tiddlywiki/mobiledragdrop/plugin.info b/plugins/tiddlywiki/mobiledragdrop/plugin.info index a8fff1e6b..cb8824d82 100644 --- a/plugins/tiddlywiki/mobiledragdrop/plugin.info +++ b/plugins/tiddlywiki/mobiledragdrop/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/mobiledragdrop", + "name": "Mobile Drag Drop", "description": "Mobile drag and drop shim", - "author": "Tim Ruffles, adapted by Jeremy Ruston ", - "core-version": ">=5.0.0", + "author": "Tim Ruffles", "list": "readme license" } diff --git a/plugins/tiddlywiki/nodewebkitsaver/plugin.info b/plugins/tiddlywiki/nodewebkitsaver/plugin.info index c2a64d8fe..d292c9e85 100644 --- a/plugins/tiddlywiki/nodewebkitsaver/plugin.info +++ b/plugins/tiddlywiki/nodewebkitsaver/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/nodewebkitsaver", - "description": "NW.js saver", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "nw.js Saver", + "description": "Saver for nw.js", "list": "readme" } diff --git a/plugins/tiddlywiki/pluginlibrary/plugin.info b/plugins/tiddlywiki/pluginlibrary/plugin.info index 07918d663..a86c01eb8 100644 --- a/plugins/tiddlywiki/pluginlibrary/plugin.info +++ b/plugins/tiddlywiki/pluginlibrary/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/pluginlibrary", + "name": "Plugin Library", "description": "Plugin library builder", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme" } diff --git a/plugins/tiddlywiki/powered-by-tiddlywiki/plugin.info b/plugins/tiddlywiki/powered-by-tiddlywiki/plugin.info index 674ee850e..e34f059ae 100644 --- a/plugins/tiddlywiki/powered-by-tiddlywiki/plugin.info +++ b/plugins/tiddlywiki/powered-by-tiddlywiki/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/powered-by-tiddlywiki", - "description": "Powered by TiddlyWiki Banner", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Powered By TiddlyWiki", + "description": "Powered by TiddlyWiki banner", "list": "readme" } diff --git a/plugins/tiddlywiki/qrcode/plugin.info b/plugins/tiddlywiki/qrcode/plugin.info index 1be38b1a3..976bb2b3b 100644 --- a/plugins/tiddlywiki/qrcode/plugin.info +++ b/plugins/tiddlywiki/qrcode/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/qrcode", + "name": "QR Code", "description": "QR Code generator", - "author": "Zeno Zeng, adapted by Jeremy Ruston", - "plugin-type": "plugin", + "author": "Zeno Zeng", "list": "readme usage examples license" } diff --git a/plugins/tiddlywiki/railroad/plugin.info b/plugins/tiddlywiki/railroad/plugin.info index f561c7bd3..95d3f65cc 100644 --- a/plugins/tiddlywiki/railroad/plugin.info +++ b/plugins/tiddlywiki/railroad/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/railroad", + "name": "Railroad", "description": "Railroad diagram generator", - "author": "AstridElocson", - "plugin-type": "plugin", + "author": "Astrid Elocson", "list": "readme usage syntax example" } diff --git a/plugins/tiddlywiki/savetrail/plugin.info b/plugins/tiddlywiki/savetrail/plugin.info index 6e7206434..67cd4c20f 100644 --- a/plugins/tiddlywiki/savetrail/plugin.info +++ b/plugins/tiddlywiki/savetrail/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/savetrail", - "description": "Auto-download modified tiddlers", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Save Trail", + "description": "Automatically download modified tiddlers", "list": "readme settings" } diff --git a/plugins/tiddlywiki/sax/plugin.info b/plugins/tiddlywiki/sax/plugin.info index 033f1a875..257f2abb3 100644 --- a/plugins/tiddlywiki/sax/plugin.info +++ b/plugins/tiddlywiki/sax/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/sax", - "description": "Wrapper for sax.js library by Isaac Z. Schlueter", + "name": "sax js", + "description": "sax.js library", "author": "Isaac Z. Schlueter", - "core-version": ">=5.0.0", "list": "readme license" } diff --git a/plugins/tiddlywiki/stacked-view/plugin.info b/plugins/tiddlywiki/stacked-view/plugin.info index 2872a79d3..0b2ae3c02 100644 --- a/plugins/tiddlywiki/stacked-view/plugin.info +++ b/plugins/tiddlywiki/stacked-view/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/stacked-view", + "name": "Stacked View", "description": "Stacked card storyview", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme" } diff --git a/plugins/tiddlywiki/tahoelafs/plugin.info b/plugins/tiddlywiki/tahoelafs/plugin.info index f44937540..7b522e937 100644 --- a/plugins/tiddlywiki/tahoelafs/plugin.info +++ b/plugins/tiddlywiki/tahoelafs/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/tahoelafs", + "name": "TahoeLAFS", "description": "Tahoe-LAFS saver", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme" } diff --git a/plugins/tiddlywiki/text-slicer/plugin.info b/plugins/tiddlywiki/text-slicer/plugin.info index 97c06fd5c..937014060 100644 --- a/plugins/tiddlywiki/text-slicer/plugin.info +++ b/plugins/tiddlywiki/text-slicer/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/text-slicer", + "name": "Text Slicer", "description": "Tools for slicing text into tiddlers", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme docs" } diff --git a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid index 487ba7cda..1a52ff905 100644 --- a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid +++ b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid @@ -10,6 +10,7 @@ description: Slice this text tiddler by headings and lists Slice this text tiddler into chunks \end +<$list filter="[!is[image]!is[binary]]" variable="ignore"> <$button tooltip=<> aria-label=<> class=<>> <$action-sendmessage $message="tm-modal" $param="$:/plugins/tiddlywiki/text-slicer/ui/slice-modal" currentTiddler=<>/> <$list filter="[prefix[yes]]"> @@ -18,4 +19,5 @@ Slice this text tiddler into chunks <$list filter="[prefix[yes]]"> Slice tiddler - \ No newline at end of file + + diff --git a/plugins/tiddlywiki/tiddlyweb/plugin.info b/plugins/tiddlywiki/tiddlyweb/plugin.info index b0e27db3e..0ba3464ec 100644 --- a/plugins/tiddlywiki/tiddlyweb/plugin.info +++ b/plugins/tiddlywiki/tiddlyweb/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/tiddlyweb", - "description": "TiddlyWeb and TiddlySpace components", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "TiddlyWeb", + "description": "Sync changes to TW5 server or TiddlyWeb server", "list": "readme" } diff --git a/plugins/tiddlywiki/tiddlyweb/save-offline.tid b/plugins/tiddlywiki/tiddlyweb/save-offline.tid index 0cc4d55cc..b2bfdbdd1 100644 --- a/plugins/tiddlywiki/tiddlyweb/save-offline.tid +++ b/plugins/tiddlywiki/tiddlyweb/save-offline.tid @@ -1,5 +1,6 @@ title: $:/plugins/tiddlywiki/tiddlyweb/save/offline +\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] \define saveTiddlerFilter() [is[tiddler]] -[[$:/boot/boot.css]] -[[$:/HistoryList]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] +[sort[title]] $(publishFilter)$ \end diff --git a/plugins/tiddlywiki/translators/macros/translatableStringEditor.tid b/plugins/tiddlywiki/translators/macros/translatableStringEditor.tid index a762f9f55..ec1a9585a 100644 --- a/plugins/tiddlywiki/translators/macros/translatableStringEditor.tid +++ b/plugins/tiddlywiki/translators/macros/translatableStringEditor.tid @@ -3,20 +3,20 @@ tags: $:/tags/Macro \define translatableStringEditorInner(tiddlerTitle) - + <$link><$list filter=<>><$text text=<>/> - + <$list filter="""$(editFieldsFilter)$""" variable="editorField"> <$edit-text tag="$(editorTagName)$" field=<> type="text" class="tc-edit-texteditor" minHeight="10px"/> - +
    <$button class="tc-btn-invisible" popup=<>> {{$:/core/images/down-arrow}} -<$reveal state=<> type="popup" position="belowleft" text="" default=""> +<$reveal state=<> type="popup" position="belowleft" positionAllowNegative="yes" text="" default="">

    Original en-GB text: diff --git a/plugins/tiddlywiki/translators/plugin.info b/plugins/tiddlywiki/translators/plugin.info index c2a12e4da..e77ea9b3f 100644 --- a/plugins/tiddlywiki/translators/plugin.info +++ b/plugins/tiddlywiki/translators/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/translators", + "name": "Translators", "description": "Translation editing tools", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme" } diff --git a/plugins/tiddlywiki/tw2parser/plugin.info b/plugins/tiddlywiki/tw2parser/plugin.info index 57fbcec5c..409ae1447 100644 --- a/plugins/tiddlywiki/tw2parser/plugin.info +++ b/plugins/tiddlywiki/tw2parser/plugin.info @@ -1,7 +1,7 @@ { "title": "$:/plugins/tiddlywiki/tw2parser", + "name": "TW2 Parser", "description": "TiddlyWiki Classic parser", - "authors": "JeremyRuston, JeffreyWilkinson", - "core-version": ">=5.0.15", + "author": "Jeffrey Wilkinson", "list": "readme" } diff --git a/plugins/tiddlywiki/tw5.com-docs/plugin.info b/plugins/tiddlywiki/tw5.com-docs/plugin.info index 10eaa3c98..d0b0de318 100644 --- a/plugins/tiddlywiki/tw5.com-docs/plugin.info +++ b/plugins/tiddlywiki/tw5.com-docs/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/tw5.com-docs", + "name": "TW5.com Docs", "description": "Documentation from tiddlywiki.com", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "" } diff --git a/plugins/tiddlywiki/twitter/plugin.info b/plugins/tiddlywiki/twitter/plugin.info index a56edfeb4..28b66f5fa 100644 --- a/plugins/tiddlywiki/twitter/plugin.info +++ b/plugins/tiddlywiki/twitter/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/twitter", - "description": "Twitter for TiddlyWiki", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "Twitter", + "description": "Twitter embedding tools", "list": "readme usage" } diff --git a/plugins/tiddlywiki/upgrade/plugin.info b/plugins/tiddlywiki/upgrade/plugin.info index 4f4664fe6..a3e6d6409 100644 --- a/plugins/tiddlywiki/upgrade/plugin.info +++ b/plugins/tiddlywiki/upgrade/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/upgrade", + "name": "Upgrade", "description": "Upgrade system for TiddlyWiki versions", - "author": "JeremyRuston", - "core-version": ">=5.0.0", "list": "readme" } diff --git a/plugins/tiddlywiki/xlsx-utils/plugin.info b/plugins/tiddlywiki/xlsx-utils/plugin.info index 93a4202f7..1fe58b75e 100644 --- a/plugins/tiddlywiki/xlsx-utils/plugin.info +++ b/plugins/tiddlywiki/xlsx-utils/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/xlsx-utils", + "name": "XLSX Utils", "description": "XLSX spreadsheet utilities", - "author": "Jeremy Ruston and SheetJS", - "core-version": ">=5.0.0", "list": "readme controls license" } diff --git a/plugins/tiddlywiki/xmldom/plugin.info b/plugins/tiddlywiki/xmldom/plugin.info index d28b438a7..b741d3e68 100644 --- a/plugins/tiddlywiki/xmldom/plugin.info +++ b/plugins/tiddlywiki/xmldom/plugin.info @@ -1,7 +1,6 @@ { "title": "$:/plugins/tiddlywiki/xmldom", - "description": "Wrapper for xmldom", - "author": "JeremyRuston", - "core-version": ">=5.0.0", + "name": "xmldom", + "description": "xmldom library", "list": "readme license" } diff --git a/readme.md b/readme.md index d26bd8fdb..d7f266e90 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@

    Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.

    TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.

    Learn more and see it in action at https://tiddlywiki.com/

    Developer documentation is in progress at https://tiddlywiki.com/dev/

    Join the Community

    Users

    The TiddlyWiki discussion groups are mailing lists for talking about TiddlyWiki: requests for help, announcements of new releases and plugins, debating new features, or just sharing experiences. You can participate via the associated website, or subscribe via email.

    Developers

    New releases of TiddlyWiki, TiddlyDesktop and TiddlyFox are announced via the discussion groups and Twitter (you can also subscribe to an Atom/RSS feed of TiddlyWiki releases from GitHub)

    Documentation

    There is also a discussion group specifically for discussing TiddlyWiki documentation improvement initiatives: http://groups.google.com/group/tiddlywikidocs

    -

    Installing TiddlyWiki on Node.js

    1. Install Node.js
      • either from your favourite package manager: typically apt-get install nodejs on Debian/Ubuntu Linux or Termux for Android, or brew install node on a Mac
      • or directly from http://nodejs.org
    2. Open a command line terminal and type:

      npm install -g tiddlywiki

      If it fails with an error you may need to re-run the command as an administrator:

      sudo npm install -g tiddlywiki (Mac/Linux)

    3. Check TiddlyWiki is installed by typing:

      tiddlywiki --version

    4. In response, you should see TiddlyWiki report its current version (eg "5.1.20-prerelease"; you may also see other debugging information reported)
    5. Try it out:
      1. tiddlywiki mynewwiki --init server to create a folder for a new wiki that includes server-related components
      2. tiddlywiki mynewwiki --listen to start TiddlyWiki
      3. Visit http://127.0.0.1:8080/ in your browser
      4. Try editing and creating tiddlers
    6. Optionally, make an offline copy:
      • click the +

        Installing TiddlyWiki on Node.js

        1. Install Node.js
          • either from your favourite package manager: typically apt-get install nodejs on Debian/Ubuntu Linux or Termux for Android, or brew install node on a Mac
          • or directly from http://nodejs.org
        2. Open a command line terminal and type:

          npm install -g tiddlywiki

          If it fails with an error you may need to re-run the command as an administrator:

          sudo npm install -g tiddlywiki (Mac/Linux)

        3. Check TiddlyWiki is installed by typing:

          tiddlywiki --version

        4. In response, you should see TiddlyWiki report its current version (eg "5.1.21"; you may also see other debugging information reported)
        5. Try it out:
          1. tiddlywiki mynewwiki --init server to create a folder for a new wiki that includes server-related components
          2. tiddlywiki mynewwiki --listen to start TiddlyWiki
          3. Visit http://127.0.0.1:8080/ in your browser
          4. Try editing and creating tiddlers
        6. Optionally, make an offline copy:
          • click the diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 92b804651..e02a8c10c 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -431,7 +431,8 @@ button svg, button img, label svg, label img { margin: 0; background: none; border: none; - cursor: pointer; + cursor: pointer; + color: <>; } .tc-btn-boxed { @@ -648,6 +649,10 @@ button.tc-tag-label, span.tc-tag-label { border-radius: 1em; } +.tc-sidebar-scrollable .tc-tag-label { + text-shadow: none; +} + .tc-untagged-separator { width: 10em; left: 0; @@ -2065,11 +2070,13 @@ html body.tc-body.tc-single-tiddler-window { } .tc-plugin-info { - display: block; + display: flex; border: 1px solid <>; + fill: <>; background-colour: <>; margin: 0.5em 0 0.5em 0; padding: 4px; + align-items: center; } .tc-plugin-info-disabled { @@ -2094,42 +2101,61 @@ a.tc-tiddlylink.tc-plugin-info:hover .tc-plugin-info > .tc-plugin-info-chunk > s } .tc-plugin-info-chunk { - display: inline-block; - vertical-align: middle; + margin: 2px; } -.tc-plugin-info-chunk h1 { - font-size: 1em; - margin: 2px 0 2px 0; +.tc-plugin-info-chunk.tc-plugin-info-toggle { + flex-grow: 0; + flex-shrink: 0; + line-height: 1; } -.tc-plugin-info-chunk h2 { +.tc-plugin-info-chunk.tc-plugin-info-icon { + flex-grow: 0; + flex-shrink: 0; + line-height: 1; +} + +.tc-plugin-info-chunk.tc-plugin-info-description { + flex-grow: 1; +} + +.tc-plugin-info-chunk.tc-plugin-info-buttons { font-size: 0.8em; + line-height: 1.2; + flex-grow: 0; + flex-shrink: 0; + text-align: right; +} + +.tc-plugin-info-chunk.tc-plugin-info-description h1 { + font-size: 1em; + line-height: 1.2; margin: 2px 0 2px 0; } -.tc-plugin-info-chunk div { +.tc-plugin-info-chunk.tc-plugin-info-description h2 { + font-size: 0.8em; + line-height: 1.2; + margin: 2px 0 2px 0; +} + +.tc-plugin-info-chunk.tc-plugin-info-description div { font-size: 0.7em; + line-height: 1.2; margin: 2px 0 2px 0; } -.tc-plugin-info:hover > .tc-plugin-info-chunk > img, .tc-plugin-info:hover > .tc-plugin-info-chunk > svg { - width: 2em; - height: 2em; - fill: <>; -} - -.tc-plugin-info > .tc-plugin-info-chunk > img, .tc-plugin-info > .tc-plugin-info-chunk > svg { - width: 2em; - height: 2em; - fill: <>; -} - -.tc-plugin-info.tc-small-icon > .tc-plugin-info-chunk > img, .tc-plugin-info.tc-small-icon > .tc-plugin-info-chunk > svg { +.tc-plugin-info-chunk.tc-plugin-info-toggle img, .tc-plugin-info-chunk.tc-plugin-info-toggle svg { width: 1em; height: 1em; } +.tc-plugin-info-chunk.tc-plugin-info-icon img, .tc-plugin-info-chunk.tc-plugin-info-icon svg { + width: 2em; + height: 2em; +} + .tc-plugin-info-dropdown { border: 1px solid <>; margin-top: -8px; @@ -2146,6 +2172,20 @@ a.tc-tiddlylink.tc-plugin-info:hover .tc-plugin-info > .tc-plugin-info-chunk > s padding: 1em 1em 1em 1em; } +.tc-plugin-library-listing .tc-install-plugin { + font-weight: bold; + background: green; + color: white; + fill: white; + border-radius: 4px; + padding: 3px; +} + +.tc-plugin-library-listing .tc-install-plugin.tc-reinstall { + background: blue; +} + + .tc-check-list { line-height: 2em; }