Merge branch 'release/1.2.3'

thediveo · Mar 29, 2018 · 10780b4 · 10780b4
2 parents 7dd1db5 + 3f157e1
commit 10780b4
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 17 deletions.
diff --git a/editions/release/output/thirdflow.html b/editions/release/output/thirdflow.html
diff --git a/editions/release/output/thirdflow.tid b/editions/release/output/thirdflow.tid
diff --git a/package.json b/package.json
@@ -1,27 +1,26 @@
 {
-  "name": "thirdflow",
-  "version": "1.2.1",
-  "author": "TheDiveO",
-  "description": "Third Flow in-TW plugin development process support",
+  "name": "tw5-thirdflow",
+  "version": "1.2.3",
+  "author": "TheDiveO <thediveo@gmx.eu>",
+  "description": "Third Flow plugin development process support for TiddlyWiki5",
   "homepage": "https://github.com/TheDiveO/ThirdFlow",
   "license": "(MIT OR CC-BY-3.0)",
   "bugs": "https://github.com/TheDiveO/ThirdFlow/issues",
-
+  "keywords": [
+    "tiddlywiki", "tiddlywiki5", "plugin", "thirdflow"
+  ],
   "main": "thirdflow.js",
-
   "scripts": {
     "start": "tiddlywiki editions/develop --verbose --server 8080 $:/core/save/all text/plain text/html & echo $! > tw.pid",
     "stop": "kill `cat tw.pid` && rm tw.pid",
     "develop": "tiddlywiki editions/develop --verbose --server 8080 $:/core/save/all text/plain text/html",
     "release": "tiddlywiki editions/release --verbose --build release",
     "test": "tiddlywiki editions/release --verbose"
   },
-
   "repository": {
     "type": "git",
     "url": "https://github.com/TheDiveO/ThirdFlow.git"
   },
-
   "dependencies": {
     "tiddlywiki": ">=5.1.15"
   },

diff --git a/src/tiddlers/system/config/DefaultMoreSidebarTab.tid b/src/tiddlers/system/config/DefaultMoreSidebarTab.tid
@@ -1,5 +1,5 @@
-created: 20180224212919108
-modified: 20180224213020854
+created: 20180311171949231
+modified: 20180311172437118
 tags: 
 title: $:/config/DefaultMoreSidebarTab
 type: text/vnd.tiddlywiki

diff --git a/src/tiddlers/system/config/DefaultSidebarTab.tid b/src/tiddlers/system/config/DefaultSidebarTab.tid
@@ -0,0 +1,6 @@
+created: 20180311172447146
+modified: 20180311172448368
+title: $:/config/DefaultSidebarTab
+type: text/vnd.tiddlywiki
+
+$:/core/ui/SideBar/More
diff --git a/src/tiddlers/system/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid b/src/tiddlers/system/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
@@ -0,0 +1,16 @@
+caption: {{$:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption}}
+created: 20180311171546924
+modified: 20180311171658348
+tags: $:/tags/ControlPanel/Settings
+title: $:/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab
+type: text/vnd.tiddlywiki
+
+\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/
+
+<$link to="$:/config/DefaultMoreSidebarTab"><<lingo Hint>></$link>
+
+<$select tiddler="$:/config/DefaultMoreSidebarTab">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
+<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
+</$list>
+</$select>
diff --git a/src/tiddlers/system/core/ui/SideBar/More.tid b/src/tiddlers/system/core/ui/SideBar/More.tid
@@ -0,0 +1,10 @@
+caption: {{$:/language/SideBar/More/Caption}}
+created: 20180311171848964
+modified: 20180311171906478
+tags: $:/tags/SideBar
+title: $:/core/ui/SideBar/More
+type: text/vnd.tiddlywiki
+
+<div class="tc-more-sidebar">
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" default={{$:/config/DefaultMoreSidebarTab}} state="$:/state/tab/moresidebar" class="tc-vertical" />
+</div>
diff --git a/src/tiddlers/system/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption.tid b/src/tiddlers/system/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption.tid
@@ -0,0 +1,7 @@
+created: 20180311172640903
+modified: 20180311172810388
+tags: 
+title: $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption
+type: text/vnd.tiddlywiki
+
+Default More Sidebar Tab
diff --git a/src/tiddlers/system/language/ControlPanel/Settings/DefaultMoreSidebarTab/Hint.tid b/src/tiddlers/system/language/ControlPanel/Settings/DefaultMoreSidebarTab/Hint.tid
@@ -0,0 +1,7 @@
+created: 20180311172813678
+modified: 20180311172839276
+tags: 
+title: $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Hint
+type: text/vnd.tiddlywiki
+
+Specify which More sidebar tab is displayed by default
diff --git a/src/tiddlers/system/plugins/TheDiveO/ThirdFlow.tid b/src/tiddlers/system/plugins/TheDiveO/ThirdFlow.tid
@@ -8,6 +8,6 @@ plugin-type: plugin
 source: http://thediveo.github.io/ThirdFlow
 title: $:/plugins/TheDiveO/ThirdFlow
 type: application/json
-version: 1.2.1
+version: 1.2.2
 
-{"tiddlers": {}}
+{"tiddlers": {}}
diff --git a/src/tiddlers/system/plugins/TheDiveO/ThirdFlow/history.tid b/src/tiddlers/system/plugins/TheDiveO/ThirdFlow/history.tid
@@ -1,8 +1,12 @@
 created: 20140902083720188
-modified: 20180224213249509
+modified: 20180311173125103
 title: $:/plugins/TheDiveO/ThirdFlow/history
 type: text/vnd.tiddlywiki
 
+* ''1.2.3''
+** makes ThirdFlow plugin available as npm package `tw5-thirdflow`.
+** the development wiki now opens the "Plugin Sources" sidebar tab by default; this can be changed in the Control Panel "Settings" tab. Please note that TiddlyWiki 5.1.16+ will have this feature anyway.
+
 * ''1.2.2''
 ** supports showing the "Plugin Sources" tab within the More sidebar tab at start for ~TiddlyWiki 5.1.16+.