Item14288: merge 'origin/master'

foswiki · May 16, 2017 · 2ac8e71 · 2ac8e71
2 parents f17cef8 + 4804978
commit 2ac8e71
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/NatEditPlugin/data/System/NatEditPlugin.txt b/NatEditPlugin/data/System/NatEditPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1493186548" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1494916015" format="1.1" version="1"}%
 ---+!! Natural Edit Plugin
 %FORMFIELD{"Description"}%
 
@@ -56,6 +56,7 @@ is sufficient.
 
 ---++ Change History
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  04 May 2017 | Foswikitask:Item14388: NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs. |
 |  20 Jan 2017 | Foswikitask:Item14265: NatEdit plugin leaves UI blocked after some save errors<br/>\
                  Foswikitask:Item14285: fixed error clicking on disabled toolbar buttons |
 |  06 Jan 2016 | Add helper to insert a data form table header. |
@@ -180,4 +181,4 @@ is sufficient.
 %META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
 %META:FIELD{name="Support" title="Support" value="https://foswiki.org/Support/%25$ROOTMODULE%25"}%
 %META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
-%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1493186548" size="64487" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1494916015" size="64487" user="ProjectContributor" version="1"}%
diff --git a/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm b/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm
@@ -31,7 +31,7 @@ BEGIN {
 }
 
 our $VERSION           = '9.9';
-our $RELEASE           = '23 Jan 2017';
+our $RELEASE           = '04 May 2017';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION  = 'A Wikiwyg Editor';
 our $baseWeb;