Merge branch 'master' of https://github.com/Jermolene/TiddlyWiki5

core/ui/MoreSideBar/Tags.tid

@@ -22,6 +22,6 @@ caption: {{$:/language/SideBar/Tags/Caption}}
 
 </$list>
 
-<br/>
+<hr class="tc-untagged-separator">
 
 {{$:/core/ui/UntaggedTemplate}} <small class="tc-menu-list-count"><$count filter="[untagged[]!is[system]] -[tags[]]"/></small>

editions/test/tiddlers/tests/test-widget.js

@@ -163,7 +163,7 @@ describe("Widget module", function() {
 		var wrapper = renderWidgetNode(widgetNode);
 		describe("should detect the recursion", function() {
 			// Test the rendering
-			expect(wrapper.innerHTML).toBe("Recursive transclusion error in transclude widget\n");
+			expect(wrapper.innerHTML).toBe("<span class='tc-error'>Recursive transclusion error in transclude widget</span>\n");
 		});
 
 	});

editions/tw5.com/tiddlers/community/resources/CouchDB Adaptor.tid

@@ -0,0 +1,14 @@
+created: 20140927155929149
+modified: 20140927155929149
+tags: Resources
+title: "CouchDB Adaptor" by William Shallum
+type: text/vnd.tiddlywiki
+url: https://github.com/wshallum/couchadaptor
+
+An adaptor to enable TiddlyWiki to sync changes with a [[CouchDB|http://couchdb.apache.org]] database.
+
+<<<
+CouchDB sync adaptor for TiddlyWiki 5. Requires TiddlyWiki >= 5.1.2.
+
+Works in limited testing. Not sure how well it handles conflicts.
+<<<

editions/tw5.com/tiddlers/hellothere/HelloThere.tid

@@ -1,6 +1,6 @@
 created: 20130822170200000
 list: [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]]
-modified: 20140922104657326
+modified: 20140927162659979
 tags: TableOfContents
 title: HelloThere
 type: text/vnd.tiddlywiki

editions/tw5.com/tiddlers/macros/TableOfContentsMacro.tid

@@ -34,10 +34,10 @@ The ''tag'' and ''sort'' parameters are combined to make a filter expression of
 ```
 
 ! Examples
-The top level entries of the table of contents examples are defined by the root tag 'Contents'<br>
-The subentries under each of those entries are tagged with the title of the entry, here 'First', 'Second', 'Third', and 'Fourth'. One level deeper only '~SecondThree' has subentries.
 
-Graphically, shown with - clickable - tag pills:
+In these examples, the top level entries of the table of contents examples are defined by the root tag ''Contents''. The subentries under each of those entries are tagged with the title of the parent entry, here ''First'', ''Second'', ''Third'', and ''Fourth''. One level deeper only ''~SecondThree'' has subentries.
+
+Here is the tag structure shown with clickable tag pills:
 
 {{Contents||$:/core/ui/TagTemplate}}
 *{{First||$:/core/ui/TagTemplate}}

editions/tw5.com/tiddlers/releasenotes/Release 5.1.2.tid

@@ -1,27 +1,36 @@
 caption: 5.1.2
 created: 20140922124011558
-modified: 20140922124011558
+modified: 20140927162422831
 tags: ReleaseNotes
 title: Release 5.1.2
 type: text/vnd.tiddlywiki
+released: 20140927162659979
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.1...v5.1.2]]//
 
-!! Incompatible Changes
+This is another small release with documentation updates and a few bug fixes and improvements.
 
-* 
+!! Usability Improvements
+
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/b3df07ae3e190cfb6fc23dbe31c6229fe5e39087]] error handling for malformed or unrecognised ~LaTeX content with [[KaTeX Plugin]]
 
 !! Hackability Improvements
 
-* 
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/42abef6fbf79342ccbd90b142d48f64ab5c1c38a]] styling of separator before the untagged item in the tags sidebar
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/23c2d90ee8e28f8c68f9ba58fcbc13a56f838d61]] error handling for the upload saver (which is used for saving to TiddlySpot)
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/115245a632e80e9d033957327dfec909a3cd1fc8]] storyview error detection
 
 !! Bug Fixes
 
-*
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/b1fb0a2a070a6abc78564e56fdb4244076ac44ac]] crash caused by incorrectly formatted plugins
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/eacb9e53ebf2a814d61bf005d68f449f7b9e63b5]] problem with tiddler info not being removed by the syncer after deleting a tiddler
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/e2046ce4ffb6b8232a4ad5e7f51c431798917787]] HTTP handling to treat response code 201 as success
 
 !! 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:
 
+* [[@Evolena|https://github.com/Evolena]]
 * [[@pmario|https://github.com/pmario]]
+* [[@simonbaird|https://github.com/simonbaird]]
 * [[@TheDiveO|https://github.com/TheDiveO]]

themes/tiddlywiki/vanilla/base.tid

@@ -330,6 +330,15 @@ button.tc-tag-label, span.tc-tag-label {
 	border-radius: 8px;
 }
 
+.tc-untagged-separator {
+	width: 10em;
+	left: 0;
+	margin-left: 0;
+	border: 0;
+	height: 1px;
+	background: <<colour tab-divider>>;
+}
+
 .tc-untagged-label {
 	background-color: <<colour untagged-background>>;
 }