Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Item13883: Merge branch 'Release02x01'
  • Loading branch information
gac410 committed Jan 24, 2017
2 parents b5be818 + 3ed69a5 commit a3adc9f
Show file tree
Hide file tree
Showing 11 changed files with 67 additions and 47 deletions.
5 changes: 3 additions & 2 deletions ConfigurePlugin/data/System/ConfigurePlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1480360746" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1485233581" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Configure Plugin
%FORMFIELD{"Description"}%
Expand Down Expand Up @@ -42,6 +42,7 @@ The plugin uses the =JsonRpcContrib=, which must be installed.

---++ Change History

| 23 Jan 2017: | (1.07) Foswikitask:Item14287: Configure needs to encode reported configuration values. |
| 28 Nov 2016: | (1.06) Foswikitask:Item13206: Upgrade to latest jquery-ui |
| 11 Apr 2016: | (1.05) Foswikitask:Item14049: fixed jsonrpc endpoint |
| 03 Feb 2016: | (1.04) Foswikitask:Item13917: Regex type doesn't correctly compare default value |
Expand All @@ -51,7 +52,7 @@ The plugin uses the =JsonRpcContrib=, which must be installed.

%META:FORM{name="PackageForm"}%
%META:FIELD{name="Author" title="Author" value="CrawfordCurrie"}%
%META:FIELD{name="Copyright" title="Copyright" value="2013-2016, CrawfordCurrie http://c-dot.co.uk, All Rights Reserved"}%
%META:FIELD{name="Copyright" title="Copyright" value="2013-2017, CrawfordCurrie http://c-dot.co.uk, All Rights Reserved"}%
%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
%META:FIELD{name="Home" title="Home" value="https://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="License" title="License" value="GPL ([[https://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
Expand Down
6 changes: 3 additions & 3 deletions ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin.pm
Expand Up @@ -31,8 +31,8 @@ package Foswiki::Plugins::ConfigurePlugin;
use strict;
use warnings;

our $VERSION = '1.06';
our $RELEASE = '28 Nov 2016';
our $VERSION = '1.07';
our $RELEASE = '23 Jan 2017';
our $SHORTDESCRIPTION = '=configure= interface using json-rpc';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down Expand Up @@ -217,7 +217,7 @@ Author: Crawford Currie http://c-dot.co.uk
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2013-2016 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2013-2017 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down
5 changes: 3 additions & 2 deletions JQueryPlugin/data/System/JQueryPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1481600913" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1485233581" format="1.1" version="1"}%
---+!! %TOPIC%
%FORMFIELD{"Description"}%

Expand Down Expand Up @@ -125,6 +125,7 @@ required for Foswiki 1.1 or later.

---++ Change History
%TABLE{columnwidths="7em" tablewidth="100%"}%
| 23 Jan 2017: | (7.21) - Item14281: Cookie related changes. Inconsistent use of the domain and secure flags. |
| 12 Dec 2016: | (7.20) - Item10918: Improve javascript api to address individual tabs. \
- Item14172: jquery.stars width incorrect in modal dialogs. \
- Item14173: Invalid call foswiki.getScriptUrl() in foswiki.getPreference(). \
Expand Down Expand Up @@ -375,7 +376,7 @@ required for Foswiki 1.1 or later.

%META:FORM{name="PackageForm"}%
%META:FIELD{name="Author" title="Author" value="ProjectContributor"}%
%META:FIELD{name="Copyright" title="Copyright" value="2007-2016 Foswiki Contributors https://foswiki.org"}%
%META:FIELD{name="Copyright" title="Copyright" value="2007-2017 Foswiki Contributors https://foswiki.org"}%
%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="License" title="License" value="GPL"}%
Expand Down
6 changes: 3 additions & 3 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin.pm
Expand Up @@ -24,8 +24,8 @@ BEGIN {
}
}

our $VERSION = '7.20';
our $RELEASE = '12 Dec 2016';
our $VERSION = '7.21';
our $RELEASE = '23 Jan 2017';
our $SHORTDESCRIPTION = 'jQuery <nop>JavaScript library for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down Expand Up @@ -495,7 +495,7 @@ sub _inlineError {
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2010-2016 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2010-2017 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down
6 changes: 4 additions & 2 deletions NatEditPlugin/data/System/NatEditPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1452118054" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1485233581" format="1.1" version="1"}%
---+!! Natural Edit Plugin
%TOC%

Expand Down Expand Up @@ -56,6 +56,8 @@ is sufficient.

| Copyright &copy;: | 2007-2015 Michael Daum http://michaeldaumconsulting.com |
| Change History: | |
| 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. |
| 08 Sep 2015 | Remove RevCommentPlugin hooks from templates, Hide TopicTitle when unused. |
| 30 Aug 2015 | fixed default implementation for =topictitle= |
Expand Down Expand Up @@ -179,4 +181,4 @@ is sufficient.
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1452118054" size="64487" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1485233581" size="64487" user="ProjectContributor" version="1"}%
41 changes: 22 additions & 19 deletions PatternSkin/data/System/PatternSkin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1480385562" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1485233581" format="1.1" version="1"}%
%META:TOPICPARENT{name="Skins"}%
%STARTINCLUDE%
---+!! Pattern skin
Expand Down Expand Up @@ -189,6 +189,9 @@ For further troubleshooting and feedback, go to http://foswiki.org/Support/%TOPI
| Preview: | [[%SCRIPTURL{view}%/%WEB%/%TOPIC%?skin=pattern][Preview with this skin]] |
| Base Name: | pattern |
| History: | <!-- specify latest version first -->&nbsp; |
| 23 Jan 2017 | v.6.08: Foswikitask:Item13831: JS error in System.LanguageSelector<br/>\
Foswikitask:Item14281: Cookie related changes. Inconsistent use of the domain and secure flags.<br/>\
Foswikitask:Item14286: PatternSkin*Navigation topics are broken, and difficult to tailor. |
| 28 Nov 2016 | v.6.07: Foswikitask:Item14069: Improve sanitization of attach filename<br/>\
Foswikitask:Item14092: Add hook to attach.pattern.tmpl to support attachment properties.<br/>\
Foswikitask:Item14145: Deprecation of beforetext/aftertext templates breaks compatibility with other skins.<br/>\
Expand Down Expand Up @@ -258,28 +261,28 @@ Leave remarks, suggestions and other feedback in http://foswiki.org/Support/%TOP

%META:FORM{name="PackageForm"}%
%META:FIELD{name="Author" title="Author" value="Arthur Clemens"}%
%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2004-2016 Arthur Clemens, Foswiki contributors"}%
%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2004-2017 Arthur Clemens, Foswiki contributors"}%
%META:FIELD{name="Description" title="Description" value="%25$SHORTDESCRIPTION%25"}%
%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/%25$ROOTMODULE%25"}%
%META:FIELD{name="License" title="License" value="GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]])"}%
%META:FIELD{name="Release" title="Release" value="%25$RELEASE%25"}%
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
%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:FILEATTACHMENT{name="print.css.gz" attr="h" comment="" date="1480385562" size="786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1480385562" size="33112" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1480385562" size="129505" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1480385562" size="2618" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1480385562" size="20605" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1480385562" size="1305" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1480385562" size="41616" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1480385562" size="20639" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1480385562" size="1732" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1480385562" size="474" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1480385562" size="620" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1480385562" size="3869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1480385562" size="8499470" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1480385562" size="92238" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1480385562" size="177943" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1480385562" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1480385562" size="5545" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css.gz" attr="h" comment="" date="1485233581" size="786" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header3.gif" attr="h" comment="" date="1485233581" size="33112" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot.png" attr="h" comment="" date="1485233581" size="129505" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01_src.js" attr="h" comment="" date="1485233581" size="2618" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header1.gif" attr="h" comment="" date="1485233581" size="20605" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js" attr="h" comment="" date="1485233581" size="1305" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header2.gif" attr="h" comment="" date="1485233581" size="41616" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header5.gif" attr="h" comment="" date="1485233581" size="20639" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern_src.js" attr="h" comment="" date="1485233581" size="1732" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js.gz" attr="h" comment="" date="1485233581" size="474" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="pattern.js.gz" attr="h" comment="" date="1485233581" size="620" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print.css" attr="h" comment="" date="1485233581" size="3869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="headers.psd" attr="h" comment="" date="1485233581" size="8499470" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="header4.gif" attr="h" comment="" date="1485233581" size="92238" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="patternskin_screenshot_full.png" attr="h" comment="" date="1485233581" size="177943" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_edit_01x01.js" attr="h" comment="" date="1485233581" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="print_src.css" attr="h" comment="" date="1485233581" size="5545" user="ProjectContributor" version="1"}%
6 changes: 3 additions & 3 deletions PatternSkin/lib/Foswiki/Contrib/PatternSkin.pm
Expand Up @@ -3,16 +3,16 @@ package Foswiki::Contrib::PatternSkin;
use strict;
use warnings;

our $VERSION = '6.07';
our $RELEASE = '28 Nov 2016';
our $VERSION = '6.08';
our $RELEASE = '23 Jan 2017';
our $SHORTDESCRIPTION =
'Pattern skin provides a CSS based default look and feel - flexible and [[http://www.w3.org/][W3C]] compliant. Its layout and color scheme are designed to provide a nice, clean and productive editing environment';

1;
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2008-2016 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1480180352" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1485233581" format="1.1" version="1"}%
%META:TOPICPARENT{name="Contribs"}%
---+!! !TopicUserMappingContrib
<!--
Expand Down Expand Up @@ -62,9 +62,11 @@ It's a part of the default distribution of the Foswiki Core.

---++ Contrib Info

| Contrib Author(s): | Copyright (C) 2007-2016 Sven Dowideit, SvenDowideit@WikiRing.com and Project Contributors. |
| Contrib Author(s): | Copyright (C) 2007-2017 Sven Dowideit, SvenDowideit@WikiRing.com and Project Contributors. |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 4.55 (26 Nov 2016) | Release with foswiki-2.1.3<br/>\
| 4.56 (23 Jan 2017) | Release with Foswiki-2.1.3<br/>\
Foswikitask:Item13883: Clarify documention on removing a user, create new RemoveUser tool topic. |
| 4.55 (26 Nov 2016) | Release with foswiki-2.1.3-Beta1<br/>\
Foswikitask:Item13936: Add alternate from= email sender address for registration messages. |
| 4.54 (8 Apr 2016) | Release with Foswiki 2.1.1<br/>\
Foswikitask:Item975: Allow bulk registration to work when Apache login is enabled.<br/>\
Expand Down
Expand Up @@ -5,14 +5,14 @@ package Foswiki::Contrib::TopicUserMappingContrib;
use strict;
use warnings;

our $VERSION = '4.55';
our $RELEASE = '26 Nov 2016';
our $VERSION = '4.56';
our $RELEASE = '23 Jan 2017';
our $SHORTDESCRIPTION = 'User management using data stored in topics';

__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2008-2016 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2008-2017 Foswiki Contributors. Foswiki Contributors
are listed in the AUTHORS file in the root of this distribution.
NOTE: Please extend that file, not this notice.
Expand Down
6 changes: 3 additions & 3 deletions core/data/System/ReleaseHistory.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1482554511" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1485233581" format="1.1" version="1"}%
%META:TOPICPARENT{name="AdminDocumentationCategory"}%
History of Foswiki
%STARTINCLUDE%
Expand All @@ -8,9 +8,9 @@ History of Foswiki

%TOC%

---++ Foswiki Release 2.1.3-Beta1 - 23 Dec 2016
---++ Foswiki Release 2.1.3-Beta2 - 24 Jan 2017

Foswiki 2.1.3-Beta1 was built on 23 Dec 2016. It is a release that contains 50 fixes and 21 enhancements.
Foswiki 2.1.3-Beta2 was built on 24 Jan 2017. It is a release that contains 60 fixes and 21 enhancements.

---++ Foswiki Release 2.1.2 - 2 May 2016

Expand Down

0 comments on commit a3adc9f

Please sign in to comment.