From b2c86f23197d4abf69c679b4f77020e5bc2fce67 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 22 Jan 2018 09:47:04 -0500 Subject: [PATCH 1/4] Item13883: Fix release notes, change logs --- CommentPlugin/data/System/CommentPlugin.txt | 15 ++++++++------- .../lib/Foswiki/Plugins/CommentPlugin.pm | 2 +- HistoryPlugin/data/System/HistoryPlugin.txt | 7 ++++--- .../lib/Foswiki/Plugins/HistoryPlugin.pm | 2 +- UpdatesPlugin/data/System/UpdatesPlugin.txt | 9 +++++---- .../lib/Foswiki/Plugins/UpdatesPlugin.pm | 2 +- core/data/System/ReleaseHistory.txt | 6 +++--- core/data/System/ReleaseNotes02x01.txt | 7 ++++--- 8 files changed, 27 insertions(+), 23 deletions(-) diff --git a/CommentPlugin/data/System/CommentPlugin.txt b/CommentPlugin/data/System/CommentPlugin.txt index f27dce2a31..b15e79ebac 100644 --- a/CommentPlugin/data/System/CommentPlugin.txt +++ b/CommentPlugin/data/System/CommentPlugin.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="" date="1512791273" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" comment="" date="1516632401" format="1.1" version="1"}% %META:TOPICPARENT{name="Plugins"}% ---+!! Comment Plugin @@ -280,7 +280,8 @@ This plugin has been significantly changed from the =10 April 2011= version ship Another great Foswiki extension from the WikiRing *WikiRing* - working together to improve your wiki experience! | Change History: | | -| 2.93 (08 Dec 2017) | Foswikitask:Item14554: remove link to unused wikiring.com domain. | +| 2.93 (22 Jan 2018) | Foswikitask:Item14554: remove link to unused wikiring.com domain.
\ + Foswikitask:Item14605: Unescaped brace in Regular Expression, Perl 5.27.8. | | 2.92 (21 Jan 2017) | Foswikitask:Item14009: Comment plugin does not properly identify location to insert comment when specified as an anchor. | | 2.91 (08 Apr 2016) | Foswikitask:Item14022: Update Foswiki.org links to https. Released with Foswiki 2.1.1. | | 2.9 (03 Feb 2016) | Foswikitask:Item13854: Set ALLOWTOPICVIEW = "*" on Comment Template. *Requires compatibility patch on Foswiki 1.x or Foswiki 1.1.10.* | @@ -335,8 +336,8 @@ Another great Foswiki extension from the | Change History: |   | -| 01 Sep 2017: | 1.14 Foswikitask:Item14471: HistoryPlugin not properly rendering date tokens. | +| 22 Jan 2018: | 1.14 Foswikitask:Item14471: HistoryPlugin not properly rendering date tokens.
\ + Foswikitask:Item14605: Unescaped brace in Regular Expression, Perl 5.27.8. | | 08 Sep 2015: | 1.13 Remove RevCommentPlugin hooks from the templates. | | 15 Mar 2015: | 1.12 Version released with Foswiki 2.0 Foswikitask:Item12881: Add HISTORYPLUGIN_NREV setting. | | 28 Nov 2012: | 1.11 Version released with Foswiki 1.1.6. Change to perl version strings | @@ -99,4 +100,4 @@ __Related Topics:__ %SYSTEMWEB%.%WIKIPREFSTOPIC%, %LOCALSITEPREFS%, [[%SYSTEMWEB %META:FIELD{name="Author" title="Author" value="Foswiki:Main.KennethLavrsen"}% %META:FIELD{name="Support" title="Support" value="https://foswiki.org/Support/HistoryPlugin"}% %META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}% -%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1512791273" size="72043" user="ProjectContributor" version="1"}% +%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1516632401" size="72043" user="ProjectContributor" version="1"}% diff --git a/HistoryPlugin/lib/Foswiki/Plugins/HistoryPlugin.pm b/HistoryPlugin/lib/Foswiki/Plugins/HistoryPlugin.pm index a9b25adc4c..ef5d458047 100755 --- a/HistoryPlugin/lib/Foswiki/Plugins/HistoryPlugin.pm +++ b/HistoryPlugin/lib/Foswiki/Plugins/HistoryPlugin.pm @@ -11,7 +11,7 @@ use Foswiki::AccessControlException (); # ========================= # Simple decimal version, no leading "v" our $VERSION = "1.14"; -our $RELEASE = '01 Sep 2017'; +our $RELEASE = '22 Jan 2018'; our $NO_PREFS_IN_TOPIC = 1; our $SHORTDESCRIPTION = 'Shows a complete history of a topic'; diff --git a/UpdatesPlugin/data/System/UpdatesPlugin.txt b/UpdatesPlugin/data/System/UpdatesPlugin.txt index 539626d3b8..c844f47738 100644 --- a/UpdatesPlugin/data/System/UpdatesPlugin.txt +++ b/UpdatesPlugin/data/System/UpdatesPlugin.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="" date="1512791273" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" comment="" date="1516632401" format="1.1" version="1"}% ---+!! %TOPIC% %$SHORTDESCRIPTION% @@ -66,8 +66,9 @@ to prevent disclosing them to the outside world. This plugin was initially developed during a collaborative design and coding session at the 2011 Foswiki Camp. | Change History: |   | -| 1.04 (28 Jul 2017) | Foswikitask:Item14448: fixed broken outdated plugins report
\ - Foswikitask:Item14529: UpdatesPlugin should not cookie realm. | +| 1.04 (22 Jan 2018) | Foswikitask:Item14448: fixed broken outdated plugins report
\ + Foswikitask:Item14529: UpdatesPlugin should not cookie realm.
\ + Foswikitask:Item14605: Fix a compile error on perl <= 5.10. | | 1.03 (03 May 2017) | Foswikitask:Item13907: Report list of extensions needing update. | | 1.02 (23 Jan 2017) | Foswikitask:Item14281: Cookie related changes. Inconsistent use of the domain and secure flags. | | 1.01 (24 Jul 2015) | Foswikitask:Item13555: Compare VERSION not RELEASE strings.
\ @@ -84,4 +85,4 @@ This plugin was initially developed during a collaborative design and coding ses %META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}% %META:FIELD{name="Home" title="Home" value="Foswiki:Extensions/%25$ROOTMODULE%25"}% %META:FIELD{name="Support" title="Support" value="Foswiki:Support/%25$ROOTMODULE%25"}% -%META:FILEATTACHMENT{name="logo.png" attr="h" comment="" date="1512791273" size="53676" user="ProjectContributor" version="1"}% +%META:FILEATTACHMENT{name="logo.png" attr="h" comment="" date="1516632401" size="53676" user="ProjectContributor" version="1"}% diff --git a/UpdatesPlugin/lib/Foswiki/Plugins/UpdatesPlugin.pm b/UpdatesPlugin/lib/Foswiki/Plugins/UpdatesPlugin.pm index 8450171550..268388711d 100644 --- a/UpdatesPlugin/lib/Foswiki/Plugins/UpdatesPlugin.pm +++ b/UpdatesPlugin/lib/Foswiki/Plugins/UpdatesPlugin.pm @@ -21,7 +21,7 @@ use warnings; use Foswiki::Func (); our $VERSION = '1.04'; -our $RELEASE = '28 Jul 2017'; +our $RELEASE = '22 Jan 2018'; our $SHORTDESCRIPTION = 'Checks Foswiki.org for updates'; our $NO_PREFS_IN_TOPIC = 1; our $core; diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt index 884b342daf..b0fc0db666 100644 --- a/core/data/System/ReleaseHistory.txt +++ b/core/data/System/ReleaseHistory.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1515471300" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1516632401" format="1.1" version="1"}% %META:TOPICPARENT{name="AdminDocumentationCategory"}% %STARTINCLUDE% @@ -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-RC - 9 Jan 2018 +---++ Foswiki Release 2.1.5 - 22 Jan 2018 -Foswiki 2.1.5-RC was built on 9 Jan 2018. It is a release that contains 42 fixes and 5 enhancements. +Foswiki 2.1.5 was built on 22 Jan 2018. It is a release that contains 43 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 index 8c8606d10a..5e368ab315 100644 --- a/core/data/System/ReleaseNotes02x01.txt +++ b/core/data/System/ReleaseNotes02x01.txt @@ -1,6 +1,6 @@ -%META:TOPICINFO{author="ProjectContributor" date="1515465502" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1516632401" format="1.1" version="1"}% %META:TOPICPARENT{name="ReleaseHistory"}% ----+!! Foswiki Release 2.1.5-RC +---+!! Foswiki Release 2.1.5 %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 9 Jan 2018. It is a release that contains 42 fixes and 5 enhancements. + * Foswiki 2.1.5 was built on 22 Jan 2018. It is a release that contains 43 fixes and 5 enhancements. ---++ Pre-installed Extensions @@ -588,6 +588,7 @@ Foswiki thanks the Translators for their efforts. If you are interesting in hel | [[%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 .txt file is modified. | +| [[%BUGS%/Item14605][Item14605]] | Unescaped brace in Regular Expression, Perl 5.27.8. | ---+++ Enhancements From 5b71de8ae645b426950500e5bd781229a88fc621 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 22 Jan 2018 10:24:36 -0500 Subject: [PATCH 2/4] Item13883: Fix release notes for 2.1.5 --- TablePlugin/data/System/TablePlugin.txt | 4 ++-- TablePlugin/lib/Foswiki/Plugins/TablePlugin.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TablePlugin/data/System/TablePlugin.txt b/TablePlugin/data/System/TablePlugin.txt index 3286d9658f..3659a34ebd 100644 --- a/TablePlugin/data/System/TablePlugin.txt +++ b/TablePlugin/data/System/TablePlugin.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1513079351" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1516634672" format="1.1" version="1"}% %META:TOPICPARENT{name="Plugins"}% ---+ Table Plugin @@ -193,7 +193,7 @@ Sort icons in the header are read from %SYSTEMWEB%.DocumentGraphics. %TABLE{columnwidths="10%,90%"}% | Change History: |   | -| 12 Dec 2017 | 1.160: Foswikitask:Item14574 - fixed cellspacing, cellpadding and tableborder using css properties instead of html attributes now | +| 22 Jan 2018 | 1.160: Foswikitask:Item14574 - fixed cellspacing, cellpadding and tableborder using css properties instead of html attributes now | | 03 Feb 2016 | 1.154: Foswikitask:Item13881 - Unicode column heading are incorrectly encoded,
\ Foswikitask:Item13405 - Unicode NFC normalization | | 30 Dec 2015 | 1.153: Foswikitask:Item13436 - Add class parameter to the TABLE macro to permit custom class specifications. | diff --git a/TablePlugin/lib/Foswiki/Plugins/TablePlugin.pm b/TablePlugin/lib/Foswiki/Plugins/TablePlugin.pm index 3005f0171f..3a417b4f34 100644 --- a/TablePlugin/lib/Foswiki/Plugins/TablePlugin.pm +++ b/TablePlugin/lib/Foswiki/Plugins/TablePlugin.pm @@ -19,8 +19,8 @@ BEGIN { } # Simple decimal version, use parse method, no leading "v" -our $VERSION = '1.154'; -our $RELEASE = '03 Feb 2016'; +our $VERSION = '1.160'; +our $RELEASE = '22 Jan 2018'; our $SHORTDESCRIPTION = 'Control attributes of tables and sorting of table columns'; our $NO_PREFS_IN_TOPIC = 1; @@ -237,7 +237,7 @@ sub debugData { __END__ Foswiki - The Free and Open Source Wiki, http://foswiki.org/ -Copyright (C) 2008-2016 Foswiki Contributors. Foswiki Contributors +Copyright (C) 2008-2018 Foswiki Contributors. Foswiki Contributors are listed in the AUTHORS file in the root of this distribution. NOTE: Please extend that file, not this notice. From 136475857f1f3fb6fa180525e357b5584d4ec42f Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 22 Jan 2018 10:42:02 -0500 Subject: [PATCH 3/4] Item000: Build Release 2.1.5 --- core/lib/Foswiki.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm index 6ae0c0bb06..c7a19e2dc5 100644 --- a/core/lib/Foswiki.pm +++ b/core/lib/Foswiki.pm @@ -211,8 +211,8 @@ BEGIN { # DO NOT CHANGE THE FORMAT OF $VERSION. # Use $RELEASE for a descriptive version. - use version 0.77; $VERSION = version->declare('v2.1.4_003'); - $RELEASE = 'Foswiki-2.1.5-RC'; + use version 0.77; $VERSION = version->declare('v2.1.5'); + $RELEASE = 'Foswiki-2.1.5'; # Default handlers for different %TAGS% # Where an entry is set as 'undef', the tag will be demand-loaded From f36f2ac487718df952862cfc366577fd353325b8 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 22 Jan 2018 13:14:19 -0500 Subject: [PATCH 4/4] Item13883: Fix build script for TopicUserMappingContrib. Was failing with 501 status, trying to upload to foswiki.org --- .../Foswiki/Contrib/TopicUserMappingContrib/build.pl | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/build.pl b/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/build.pl index 7d5dc37948..c2b5c675d6 100755 --- a/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/build.pl +++ b/TopicUserMappingContrib/lib/Foswiki/Contrib/TopicUserMappingContrib/build.pl @@ -15,18 +15,6 @@ BEGIN # These defaults will be used when expanding tokens in .txt # files, but be warned, they can be overridden at upload time! -# name of web to upload to -$build->{UPLOADTARGETWEB} = 'Extensions'; - -# Full URL of pub directory -$build->{UPLOADTARGETPUB} = 'http://foswiki.org/pub'; - -# Full URL of bin directory -$build->{UPLOADTARGETSCRIPT} = 'http://foswiki.org/bin'; - -# Script extension -$build->{UPLOADTARGETSUFFIX} = ''; - # Build the target on the command line, or the default target $build->build( $build->{target} );