Item13883: Merge branch 'Release02x01'

foswiki · Jan 10, 2018 · 859b5b1 · 859b5b1
2 parents deb0c20 + aff7d63
commit 859b5b1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/MailerContrib/data/System/MailerContrib.txt b/MailerContrib/data/System/MailerContrib.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1514044811" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1515465502" format="1.1" version="1"}%
 %META:TOPICPARENT{name="Contribs"}%
 ---+!! Mailer Contrib
 <img src="%ATTACHURL%/logo.gif" class="foswikiRight" />
@@ -274,10 +274,11 @@ Many thanks to the following sponsors for supporting this work:
 
 |  Copyright &copy;: | 2004, Wind River Systems; 2009-2014 Foswiki Contributors |
 |  Change History: | |
-|  2.85  (23 Dec 2017) | Foswiki 2.1.5  Foswikitask:Item14554: remove link to unused wikiring.com domain.<br/>\
+|  2.85  (8 Jan 2018) | Foswiki 2.1.5  Foswikitask:Item14554: remove link to unused wikiring.com domain.<br/>\
                         Foswikitask:Item13350: Mailnotify appears to skip notification of some changes.<br/>\ 
                         Foswikitask:Item14446: Unwritable =work_area= results in mega-spam.<br/>\
-                        Foswikitask:Item14588: mailnotify fills debug log with errors about "surprising mapping" and "missing mapping". |
+                        Foswikitask:Item14588: mailnotify fills debug log with errors about "surprising mapping" and "missing mapping".<br/>\
+                        Foswikitask:Item14590: missing closing tag in html diff of mailnotify. |
 |  2.84  (8 Feb 2017) | Foswiki 2.1.3  Minor file permissions changes |
 |  2.83  (15 Nov 2016) | Foswikitask:Item13936: Allow From: address of emails to be separately configured<br />\
                          Foswikitask:Item14216: mailnotify fails with "Wide character in print" |
@@ -323,5 +324,5 @@ Many thanks to the following sponsors for supporting this work:
 %META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
 %META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
 %META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
-%META:FILEATTACHMENT{name="logo.gif" attr="h" comment="" date="1514044811" size="11437" user="ProjectContributor" version="1"}%
-%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1514044811" size="1343" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="logo.gif" attr="h" comment="" date="1515465502" size="11437" user="ProjectContributor" version="1"}%
+%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1515465502" size="1343" user="ProjectContributor" version="1"}%
diff --git a/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm b/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm
@@ -30,7 +30,7 @@ use Foswiki::Contrib::MailerContrib::UpData    ();
 
 # Also change Version/Release in Plugins/MailerContrib.pm
 our $VERSION          = '2.85';
-our $RELEASE          = '23 Dec 2017';
+our $RELEASE          = '8 Jan 2018';
 our $SHORTDESCRIPTION = 'Supports email notification of changes';
 
 # PROTECTED STATIC ensure the contrib is internally initialised

diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1513393570" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1515471300" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminDocumentationCategory"}%
 %STARTINCLUDE%
 <noautolink>
@@ -8,9 +8,9 @@
 The complete timeline of Foswiki Releases. Foswiki was forked from TWiki 4.2.4 and released with significant improvments as Foswiki 1.0 in January 2009.  Since then there have been 31 releases, with 2 major versions and 2 minor versions. 
 
 %TOC%
----++ Foswiki Release 2.1.5-Beta2 - 18 Dec 2017
+---++ Foswiki Release 2.1.5-RC - 9 Jan 2018
 
-Foswiki 2.1.5-Beta2 was built on 16 Dec 2017. It is a release that contains 38 fixes and 5 enhancements.
+Foswiki 2.1.5-RC was built on 9 Jan 2018. It is a release that contains 42 fixes and 5 enhancements.
 
 ---++ Foswiki Release 2.1.4 - 31 May 2017
 

diff --git a/core/data/System/ReleaseNotes02x01.txt b/core/data/System/ReleaseNotes02x01.txt
@@ -1,6 +1,6 @@
-%META:TOPICINFO{author="ProjectContributor" date="1514044811" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1515465502" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="ReleaseHistory"}%
----+!! Foswiki Release 2.1.5-Beta2
+---+!! Foswiki Release 2.1.5-RC
 
 %TWISTY{showlink="Table of Contents..." hidelink="hide TOC"}%
 %TOC%
@@ -56,7 +56,7 @@ Foswiki is released under the GNU General Public License.
    * Foswiki 2.1.2 was built on 02 May 2016. It is a release that contains 1 fix.
    * Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.
    * Foswiki 2.1.4 was built on 31 May 2017. It is a release that contains 31 fixes.
-   * Foswiki 2.1.5-RC was built on xx Dec 2017. It is a release that contains 39 fixes and 5 enhancements.
+   * Foswiki 2.1.5-RC was built on 9 Jan 2018. It is a release that contains 42 fixes and 5 enhancements.
 
 
 ---++ Pre-installed Extensions
@@ -103,7 +103,7 @@ _agent_. This is only valid when using HTTP authentication. The REST and JSONRPC
 
 ---+++ Running Foswiki on a Windows based web server
 
-This release fixes a critical error that prevented Foswiki from being installed on Windows.  Foswiki mistakenly used a reserved filename for 
+This release fixes a critical error that prevented Foswiki from being installed on Windows.  Foswiki mistakenly used a reserved filename for
 a module which blocked installaion on Windows.   This has been corrected in this release.
 
 ---++ Important changes in Foswiki 2.1.3
@@ -578,6 +578,9 @@ Foswiki thanks the Translators for their efforts.  If you are interesting in hel
 | [[%BUGS%/Item14584][Item14584]] | jquery.wikiword changed interpretation of source parameter in a incompatible way. |
 | [[%BUGS%/Item14586][Item14586]] | Blinking scrollbar in natedit caused by incorrect window height. |
 | [[%BUGS%/Item14588][Item14588]] | mailnotify fills debug log with errors about "surprising mapping" and "missing mapping". |
+| [[%BUGS%/Item14589][Item14589]] | Invalid help link when editing topic preferences. |
+| [[%BUGS%/Item14590][Item14590]] | Missing closing tag in html diff of mailnotify. |
+| [[%BUGS%/Item14591][Item14591]] | Store fails to read old revisions with RcsWrap store, if <code>.txt</code> file is modified. |
 
 ---+++ Enhancements
 

diff --git a/core/locale/zh-tw.po b/core/locale/zh-tw.po
@@ -5,12 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Foswiki $Id\n"
-"Report-Msgid-Bugs-To: foswiki-develop@lists.foswiki.org\n"
+"Report-Msgid-Bugs-To: foswiki-svn@lists.sourceforge.net\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2017-12-20 02:31+0200\n"
 "Last-Translator: CH yang <dr3939@gmail.com>\n"
-"Language-Team: Traditional Chinese "
-"<http://translate.foswiki.org/projects/foswiki/distribution-master/zh_TW/>\n"
+"Language-Team: Traditional Chinese <http://translate.foswiki.org/projects/"
+"foswiki/distribution-master/zh_TW/>\n"
 "Language: zh-tw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"