Merge remote-tracking branch 'upstream/master'

editions/tw5.com/tiddlers/GettingStarted.tid

@@ -1,5 +1,5 @@
 created: 20131129090249275
-modified: 20140720212022007
+modified: 20140811172052886
 tags: introduction
 title: GettingStarted
 type: text/vnd.tiddlywiki
@@ -11,31 +11,9 @@ GettingStarted - $(browser-name)$
 <$macrocall $name="tabs" state="$:/state/tabs/platform" tabsList="[prefix[GettingStarted - ]]" default=<<default-platform>> class="tw-vertical"/>
 </$set>
 
------
+See also:
 
-TiddlyWiki is very flexible, and there are many different ways to use it. Here we're focusing on using it as a standalone file in the browser, which is a good choice for most users as it doesn't require any special knowledge or tools. For more options you can also run [[TiddlyWiki on Node.js]].
+* [[Saving with Encryption]] explains how to use TiddlyWiki's built-in encryption to protect your content with a password
-
-[[Video Tutorials]] are available, too.
-
-! The 'works anywhere' method
-
-{{Saving with the HTML5 fallback saver}}
-
-! The convenient and fast method
-
-Saving changes as described above is quite inconvenient because of the degree of manual intervention that browsers require. The following alternative method is recommended for everyone who is able to use Mozilla's [[Firefox]] browser.
-
-{{Saving with TiddlyFox}}
-
-! Other ways of saving changes
-
-[[Saving with Encryption]] explains how to use TiddlyWiki's built-in encryption to protect your content with a password.
-
-You can also try:
-
-* [[Using TiddlyWiki on TiddlyDesktop]], a custom desktop application for working with TiddlyWiki
-* [[Saving on iPad/iPhone]] with the custom ''TWEdit'' app
-* [[Saving on Android]] with the custom ''~AndTidWiki'' app
-* [[Saving on InternetExplorer]] with the [[TiddlyIE]] extension, or via the [[Windows HTA Hack]] 
 * [[Saving on TiddlySpot]], a free service that lets you use TiddlyWiki online
 * Running [[TiddlyWiki on node-webkit]], turning a single TiddlyWiki into a native application on your desktop
+* [[Using TiddlyWiki on TiddlyDesktop]], a custom desktop application for working with TiddlyWiki

editions/tw5.com/tiddlers/HelloThere.tid

@@ -1,14 +1,14 @@
 created: 20130822170200000
-modified: 20140810111402520
+modified: 20140811224027280
 tags: introduction
 title: HelloThere
 type: text/vnd.tiddlywiki
 
-Welcome to TiddlyWiki, an open source notebook that anyone can use  and keep forever, independently of any corporation.
+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|SingleFileApplication]] or as a powerful [[Node.js application|Node.js]]. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.
 
-This is version <<version-link>> of ~TiddlyWiki, a major reboot designed [[for the next 25 years|Future of TiddlyWiki]]. It is currently in beta (see the detailed ReleaseHistory). There is a RoadMap for moving to the full release. It is a great time to [[get involved|Community]] and support the future development of ~TiddlyWiki.
+This is version <<version-link>> of ~TiddlyWiki, a major reboot designed [[for the next 25 years|Future of TiddlyWiki]]. It is currently in beta (see the detailed ReleaseHistory) with a RoadMap for moving to the full release. It is a great time to [[get involved|Community]] and support the future development of ~TiddlyWiki.
 
 //~TiddlyWiki is a free, open source project that depends on [[your love and support|HelpingTiddlyWiki]] for its survival//.
 

editions/tw5.com/tiddlers/Release 5.0.14beta.tid

@@ -1,15 +1,25 @@
+caption: 5.0.14-beta
 created: 20140518150234142
-modified: 20140624094134118
+modified: 20140811153116300
 tags: releasenote
 title: Release 5.0.14-beta
 type: text/vnd.tiddlywiki
-caption: 5.0.14-beta
 
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.0.13-beta...v5.0.14-beta]]//
 
 !! Major Changes
 
-!!! Introduction of Upgrade Mechanism
+!!! Improved Control Panel Plugins Tab
+
+The ''Plugins'' tab of the [[control panel|$:/ControlPanel]] has been improved with the addition of documentation tabs that plugins can use to show documentation. There is also a larger draggable area for dragging tiddlers across to other wikis.
+
+!!! Configurable Button Toolbars
+
+The page toolbar and the tiddler toolbars can now be configured with several new buttons - see the [[control panel|$:/ControlPanel]] under the ''Appearance'' and ''Toolbars'' tabs.
+
+The sidebar tools tab now shows all the available page controls, allowing them to be invoked or checked to appear in the toolbar. The tiddler info area now includes a tools tab that includes buttons for all the tiddler actions.
+
+!!! Upgrade Mechanism
 
 There are two components:
 
@@ -19,32 +29,45 @@ There are two components:
 *** The [[plugin upgrader|$:/core/modules/upgraders/plugins.js]] module handles version checking of plugins and upgrading them from a special UpgradeLibrary plugin tiddler
 *** The [[system upgrader|$:/core/modules/upgraders/system.js]] module is responsible for suppressing the importing of certain system tiddlers (currently [[$:/StoryList]] and [[$:/HistoryList]])
 *** The [[themetweak upgrader|$:/core/modules/upgraders/themetweaks.js]] module handles migrating theme tweaks from their pre-5.0.14-beta format (see below)
-* An UpgradePlugin and associated edition that provides a custom, single-purpose user interface for upgrading standalone TiddlyWiki files
+* An UpgradePlugin and associated edition that provides a custom, single-purpose user interface for upgrading standalone TiddlyWiki files - see http://tiddlywiki.com/upgrade.html
 
-!!! PermaView (and PermaLinks) Off by Default
+!!! Improvements to CamelCase Recognition
 
-The browser address bar is automatically updated with previous beta releases of TiddlyWiki so that it dynamically reflects the tiddlers that are currently open. This makes it easier to get a permalink for copying and pasting elsewhere, but it leads to much confusion for casual users who don't always understand why unexpected tiddlers are being displayed.
+TiddlyWiki now takes a much more conservative approach to recognising CamelCase terms that should be automatically linked. Previously, the dash and underscore were treated as lower case letters, leading to a number of false positives. See the [[GitHub bug #337|https://github.com/Jermolene/TiddlyWiki5/issues/337]] for details.
+
+!!! Automatic Permalinking Off by Default
+
+With previous beta releases of TiddlyWiki the browser address bar is automatically updated so that it dynamically reflects the tiddlers that are currently open. This makes it easier to get a permalink for copying and pasting elsewhere, but it leads to much confusion for casual users who don't always understand why unexpected tiddlers are being displayed after they have refreshed the page in the browser.
 
 For 5.0.14-beta, the setting has been changed. Visit [[control panel|$:/ControlPanel]] ''Advanced''/''Settings'' to switch the setting back to "Include the target tiddler and the current story sequence".
 
-!! Accessibility Improvements
-
-* 
-
 !! Usability Improvements
 
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f6d7d87a3d49f816ccc050bdf4a5394eed37dd51]] previews to the icon dropdown in the [[tag manager|$:/TagManager]]
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/56945d91d327489478fc44dce5234ece35a01abb]] an indication of unsaved changes by changing the colour of the save changes button
+* [[Split|https://github.com/Jermolene/TiddlyWiki5/commit/7aa6c7c06d8b5359f183e6b9f6f57cf89611cda8]] the wikitext emphasis parsers into separate modules so that they can be independently controlled with the `\rules` pragma
 * [[Refactored|https://github.com/Jermolene/TiddlyWiki5/commit/f43cd5ba9c6e5eda221ec738174e61e34fad2b8d]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/a3de93b4eb8b108239b2e4b496308026e9e9eef8]]) ReleaseHistory to place the releases into vertical tabs
 * [[Stopped|https://github.com/Jermolene/TiddlyWiki5/commit/3ff7462afd5414b92680c6b6e67274be79233224]] saving [[$:/HistoryList]], thus avoiding it uncontrollably increasing in size
 * [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/73cf1bfdb3cd238ac7800162f58d44a8bb60019b]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/d5e4b9b5d1e7db5ad4d769433cc934ef08265f57]]) print stylesheet to remove page background
 * [[Updated|https://github.com/Jermolene/TiddlyWiki5/commit/07f13b310d300631267936ad8bc55a338369afc0]] display of plugin tiddlers so that their constituent tiddlers are shown, rather than the raw JSON
+* [[Moved|https://github.com/Jermolene/TiddlyWiki5/commit/799a5b059a40a51fdeb1dae7a0eb5bf8a79f5106]] the functionality of the fullscreen plugin into the core
 
 !! Hackability Improvements
 
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/c23f6af4b5c59f4d09dd8d6704e1939bb9d5b2d3]] TiddlerWidget to add a CSS class corresponding to each tag present on displayed tiddlers
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/d357e1706c91d17a72fb19fedf43e57071fc7dd6]] support for hiding specified fields in the tiddler editor
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/be040ea8a2cc8962f1a28a313e4c9ebc2d5c0e31]] support for variable operands in filters (see [[Introduction to Filters]])
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/1f16ef6fa88b51d2dad7c8e57fcff014950a7442]] support for widget messages [[tw-permalink|WidgetMessage: tw-permalink]] and [[tw-permaview|WidgetMessage: tw-permaview]] 
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/tree/master/plugins/tiddlywiki/browser-sniff]] browser sniffing plugin so that tiddlywiki.com can present the correct browser-specific documentation
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/ef67cc3fd9b267a522598abccdfbb93fbfca240c]] a configuration option for specifying the default location for saving new tiddlers in the client-server configuration
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b4d47858e587c96f3a68cc28cffff181ec45f55f]] support for the InfoMechanism
 * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/f08f57c5d24eb0146ac2cb77472a5fc5f135f1e9]] CheckboxWidget to allow it to toggle fields as well as tags
 * [[Refactored|https://github.com/Jermolene/TiddlyWiki5/commit/21c137a66c37f010b36697bb6bed5321138fbb9f]] [[control panel|$:/ControlPanel]] theme tweaks to be stored in individual tiddlers
 * [[Extend|https://github.com/Jermolene/TiddlyWiki5/commit/e18d8a88661a1c2caa1b722841747c75ca6af437]] the TabsMacro to allow tabs to be templated
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/91acad0f7ce8637945a953dfcb122cd31292626d]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/8612bc4006e717e4fa3c562fa72a85650206b66f]]) SystemTags support for inserting content above and below the story river
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f793816dfa687ae7791143b33487fd5f95f3265c]] support for transcluding plugin subtiddlers with the TranscludeWidget
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c73853288c5b4b0716da94fea2f2edec09345643]] (and [[here|https://github.com/Jermolene/TiddlyWiki5/commit/08f775eac8cb053d08c1c561e65a5eeb87c4c6b6]]) support for importing from `*.htm` and `*.hta` files as well as the existing support for `*.html` files
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/73d7e85e11c7732080ca8bc4321ebb12afbac09c]] the "sticky titles" theme so that it works when tiddlers are in edit mode
 
 !! Bug Fixes
 
@@ -52,9 +75,13 @@ For 5.0.14-beta, the setting has been changed. Visit [[control panel|$:/ControlP
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/d93da81671a704377209fc1871425c3a7c5db35a]] bug with missing hover colours for external links
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/465f4ac46903070759a572d183c498c5579cb922]] problem with refreshing modal dialogues
 * [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/3351ae7e29cbf3bed6fc1925ef33664bcc59fef5]] issue with cookies disabled on Firefox
+* [[Relax|https://github.com/Jermolene/TiddlyWiki5/commit/5260899d8b090e8886e41e3aa770fdcf5967ad8c]] the requirement for a newline immediately the closing `\end` of a macro definition
 
 !! 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:
 
 * [[@BramChen|https://github.com/BramChen]]
+* [[@pmario|https://github.com/pmario]]
+* [[@ssokolow|https://github.com/ssokolow]]
+* [[@xcazin|https://github.com/xcazin]]

editions/tw5.com/tiddlers/Saving on Safari.tid

@@ -0,0 +1,23 @@
+created: 20140811171304926
+modified: 20140811171800263
+tags: howto
+title: Saving on Safari
+type: text/vnd.tiddlywiki
+
+This method of saving changes is clunky because it requires manual intervention for each save.
+
+# [[Download]] an empty TiddlyWiki by clicking this button:
+#> {{$:/editions/tw5.com/snippets/download-empty-button}}
+#> If the button doesn't work save this link: http://tiddlywiki.com/empty.html
+#> Your browser may ask you to accept the download before it begins
+# Locate the file you just downloaded
+#* You may rename it, but be sure to keep the `.html` or `.htm` extension
+# Open the file in Safari
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''done'' button
+# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
+# A popup "Download changes" window is displayed that includes a link labelled //Right-click to save changes//
+# Right-click on the link and select "Download Linked File As..." from the popup menu
+# Navigate to the folder containing your wiki HTML file and select the existing file
+# Click the "Save" button
+# Click "Replace" to confirm replacing the existing file
+# Verify that your changes have been saved correctly

editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Android.tid

@@ -1,5 +1,7 @@
-title: GettingStarted - Android
 caption: Android
+created: 20140811171036268
+modified: 20140811171041595
+title: GettingStarted - Android
+type: text/vnd.tiddlywiki
 
-These are instructions for Android.
+{{Saving on Android}}
-

editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Chrome.tid

@@ -1,4 +1,9 @@
-title: GettingStarted - Chrome
 caption: Chrome
+created: 20140811165935523
+modified: 20140811170107969
+title: GettingStarted - Chrome
+type: text/vnd.tiddlywiki
 
-These are instructions for Chrome
+TiddlyWiki on Google Chrome can only save changes using the HTML5-compatible fallback saver module.
+
+{{Saving with the HTML5 fallback saver}}

editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Firefox.tid

@@ -1,4 +1,9 @@
-title: GettingStarted - Firefox
 caption: Firefox
+created: 20140811170425199
+modified: 20140811170527083
+title: GettingStarted - Firefox
+type: text/vnd.tiddlywiki
 
-These are instructions for Firefox
+Firefox provides the best user experience for using TiddlyWiki with the TiddlyFox browser extension.
+
+{{Saving with TiddlyFox}}

editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Internet Explorer.tid

@@ -1,5 +1,9 @@
-title: GettingStarted - Internet Explorer
 caption: Internet Explorer
+created: 20140811172058274
+modified: 20140811172247864
+title: GettingStarted - Internet Explorer
+type: text/vnd.tiddlywiki
 
-These are instructions for Internet Explorer.
+{{Saving with TiddlyIE}}
 
+The [[Windows HTA Hack]] describes an alternative method of using TiddlyWiki with Internet Explorer.

editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Node.js.tid

@@ -1,4 +1,7 @@
-title: GettingStarted - Node.js
 caption: Node.js
+created: 20140811172010003
+modified: 20140811172012677
+title: GettingStarted - Node.js
+type: text/vnd.tiddlywiki
 
-Instructions for Node.js
+{{Installing TiddlyWiki on Node.js}}

editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Safari.tid

@@ -1,5 +1,10 @@
-title: GettingStarted - Safari
 caption: Safari
+created: 20140811171121022
+modified: 20140811171247643
+title: GettingStarted - Safari
+type: text/vnd.tiddlywiki
 
-These are instructions for Safari.
+TiddlyWiki on Safari can only save changes using the HTML5-compatible fallback saver module.
+
+{{Saving on Safari}}
 

editions/tw5.com/tiddlers/gettingstarted/GettingStarted - iOS.tid

@@ -1,5 +1,7 @@
-title: GettingStarted - iOS
 caption: iPad/iPhone
+created: 20140811170918707
+modified: 20140811170921731
+title: GettingStarted - iOS
+type: text/vnd.tiddlywiki
 
-These are instructions for iPad/iPhone/iPod.
+{{Saving on iPad/iPhone}}
-

editions/tw5.com/tiddlers/gettingstarted/GettingStarted - unknown.tid

@@ -1,5 +0,0 @@
-title: GettingStarted - unknown
-caption: unknown
-
-Your current browser is unknown.
-

editions/tw5.com/tiddlers/saving/Saving on Android.tid

@@ -1,9 +1,9 @@
 created: 20130825161400000
-modified: 20131203112539560
+modified: 20140811171026344
 tags: howto
 title: Saving on Android
 type: text/vnd.tiddlywiki
 
-The AndTidWiki app for Android devices makes it possible to edit and save changes to TiddlyWiki5, including working offline without a network connection.
+The AndTidWiki app for Android devices makes it possible to edit and save changes to TiddlyWiki5, including working offline without a network connection. [[Download it here|https://play.google.com/store/apps/details?id=de.mgsimon.android.andtidwiki]].
 
 //Note that AndTidWiki is published independently of TiddlyWiki//

editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid

@@ -1,10 +1,10 @@
 created: 20131129092604900
-modified: 20140226201353048
+modified: 20140811170321179
 tags: howto
 title: Saving with the HTML5 fallback saver
 type: text/vnd.tiddlywiki
 
-This method of saving changes is clunky but has the advantage of working on almost all desktop browsers, and many mobile browsers.
+This method of saving changes is clunky because it requires manual intervention for each save. It has the advantage of working on almost all desktop browsers, and many mobile browsers.
 
 # [[Download]] an empty TiddlyWiki by clicking this button:
 #> {{$:/editions/tw5.com/snippets/download-empty-button}}
@@ -13,8 +13,8 @@ This method of saving changes is clunky but has the advantage of working on almo
 # Locate the file you just downloaded
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in your browser
-# Try creating a new tiddler using the ''plus'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''tick'' button
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''done'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''download'' button in the sidebar
+# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
 # Your browser will download a new copy of the wiki incorporating your changes
 # Locate the newly downloaded file and open it in your browser
 # Verify that your changes have been saved correctly

themes/tiddlywiki/vanilla/base.tid

@@ -1135,8 +1135,8 @@ canvas.tw-edit-bitmapeditor  {
 	padding-top: 0;
 	padding-left: 14px;
 	border-left: 1px solid <<colour tab-border>>;
-	-webkit-flex: 0 0 70%;
+	-webkit-flex: 0 0 84%;
-	flex: 0 0 70%;
+	flex: 0 0 84%;
 }
 
 .tw-sidebar-lists .tw-tab-buttons button.tw-tab-selected {