Skip to content

Commit

Permalink
Item000: Merge branch 'Release02x01'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gac410
gac410 committed Feb 14, 2017
2 parents 4cecf26 + 5ba9154 commit d0676ea
Show file tree
Hide file tree
Showing 8 changed files with 128 additions and 69 deletions.
27 changes: 6 additions & 21 deletions EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/build.pl
View file
@@ -1,28 +1,13 @@
#!/usr/bin/env perl
use strict;
use warnings;

BEGIN { unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} ); }

#!/usr/bin/perl -w
BEGIN {
unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} );
}
use Foswiki::Contrib::Build;

# Create the build object
$build = new Foswiki::Contrib::Build('EditRowPlugin');

# Set the details of the repository for uploads.
# This can be any web on any accessible TWiki installation.

# 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} = '';
my $build = new Foswiki::Contrib::Build('EditRowPlugin');

# Build the target on the command line, or the default target
$build->build( $build->{target} );

26 changes: 6 additions & 20 deletions ModPerlEngineContrib/lib/Foswiki/Contrib/ModPerlEngineContrib/build.pl
View file
@@ -1,27 +1,13 @@
#!/usr/bin/perl -w
#!/usr/bin/env perl
use strict;
use warnings;

BEGIN { unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} ); }

use Foswiki::Contrib::Build;

# Create the build object
$build = new Foswiki::Contrib::Build('ModPerlEngineContrib');

# (Optional) Set the details of the repository for uploads.
# This can be any web on any accessible Foswiki installation.
# 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} = '';
my $build = new Foswiki::Contrib::Build('ModPerlEngineContrib');

# Build the target on the command line, or the default target
$build->build( $build->{target} );

3 changes: 2 additions & 1 deletion PatternSkin/data/System/PatternSkin.txt
View file
Expand Up @@ -189,7 +189,8 @@ 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; |
| 8 Feb 2017 | v.6.09: Foswikitask:Item14315: Attachment count always shows latest revision when viewing prior versions. |
| 8 Feb 2017 | v.6.09: Foswikitask:Item14315: Attachment count always shows latest revision when viewing prior versions.<br/>\
Foswikitask:Item14235: Sanitize some template fields. |
| 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. |
Expand Down
17 changes: 16 additions & 1 deletion core/data/System/PageCaching.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1459790135" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1486929101" format="1.1" version="1"}%
%META:TOPICPARENT{name="AdminDocumentationCategory"}%
---+!! Page Caching
How to get the best from HTML Caching.
Expand Down Expand Up @@ -360,6 +360,21 @@ Example:
This will add !MyOwnProtectedTopic to the set of default topics to be refreshed
on every change in the web it is in.

---++++ Controlling growth of topic dependencies table
By default, Foswiki will track every linked topic mentioned on a page as a dependency of
that page. This can result in very rapid growth of the cache dependencies
table, especially when the !WebLeftBar uses the =WEBLIST= macro, or links to a
large number of pages. These are tracked so that when a topic is added or
removed, the referencing pages will be refreshed to get the correct link to
the topic.

An optional (expert) configuration parameter ={Cache}{TrackInternalLinks}=
can be set to disable tracking these links for guests or for everyone. For
sites exposed to the Internet and search bot traffic, change this setting
from =on= to =authenticated= to ignore links in topics viewed by
guests. The setting =off= will disable all topic reference tracking, and is
_not_ recommended.

---++++ HTTP Compression
Modern browsers can decompress content encoded using gzip compression. You can
save a lot of network bandwidth by compressing pages, at the expense of some
Expand Down
6 changes: 3 additions & 3 deletions core/data/System/ReleaseHistory.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1486607275" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1486929101" 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-RC1 - 02 Feb 2017
---++ Foswiki Release 2.1.3 - 12 Feb 2017

Foswiki 2.1.3-RC1 was built on 02 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.
Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.

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

Expand Down
38 changes: 31 additions & 7 deletions core/data/System/ReleaseNotes02x01.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1486607275" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1486929101" format="1.1" version="1"}%
%META:TOPICPARENT{name="ReleaseHistory"}%
---+!! Foswiki Release 2.1.3

Expand Down Expand Up @@ -54,7 +54,7 @@ Foswiki is released under the GNU General Public License.
* Foswiki 2.1.0 was built on 02 Feb 2016. It is a release that contains 37 fixes and 14 enhancements. It closes 7 Feature Requests.
* Foswiki 2.1.1 was built on 30 Apr 2016. It is a release that contains 36 fixes and 21 enhancements.
* Foswiki 2.1.2 was built on 2 May 2016. It is a release that contains 1 fix.
* Foswiki 2.1.3-RC1 was built on 08 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.
* Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.


---++ Pre-installed Extensions
Expand Down Expand Up @@ -82,6 +82,12 @@ See [[%BUGS%/Item13696][Item13696]] for up-to-date details.

---++ Important changes in Foswiki 2.1.3

---+++ Security issues addressed in this release.

This release addresses 7 Severity 3 security vulnerabilities which are described in further detail
in [[https://foswiki.org/Support/SecurityAlert-XSSIssues-2017-0201][Support.SecurityAlert-XSSIssues-2017-0201]].
See [[https://foswiki.org/Development/SecurityAlertProcess][Security Alert Process]] for more details on how the Foswiki project handles security issues.

---+++ Possible data loss in DataForms

A possible data loss issue was discovered in DataForms migrated from Foswiki 1.x. A new configuration setting (={LegacyFormfieldNames}=) was added to restore the old Foswiki 1.x behavior.
Expand All @@ -105,9 +111,9 @@ See [[%BUGS%/Item14256][Item14256]] for more details.

---+++ Cookie changes

The optional configuration parameter ={Sessions}{CookieRealm}= now applies to all cookies generated by the Foswiki core. In addition, if your site is accessed
over HTTPS, all cooikes will now have the "Secure" flag set. In prior releases, only the Foswiki session cookie was covered. After upgrade to 2.1.3, users may
lose saved preferences if the cookie domain changes.
The optional (expert) configuration parameter ={Sessions}{CookieRealm}= now applies to the Domain of all cookies generated by the Foswiki core. In addition, if your site is accessed
over HTTPS, all cooikes will now have the =Secure= flag set. In prior releases, only the Foswiki session cookie used the =CookieRealm= and =Secure= flag. After upgrade to 2.1.3, users may
lose saved preferences and/or fail strikeone validation due to the cookie domain change. If using a non-default =CookieRealm= setting, users may need to delete all domain cookies after this update.

---+++ User Registration

Expand All @@ -124,10 +130,28 @@ Foswiki on a small device. See [[System.PatternSkinCssCookbookSidebarToggle]].

---+++ Configuration bootstrap

Bootstrap should be able to detect operation behind a proxy server, and will hopefully get the protocol (HTTP or HTTPS) and the hostname used by the user
Bootstrap should be able to detect operation behind a proxy server, and will try harder to get the protocol (HTTP or HTTPS) and the hostname used by the user
correct. If bootstrap fails to properly set up a proxy configuration, we would appreciate bug reports that will help us improve operation. Note that
operation behind a chain of multiple proxy servers is not currently detected.

---+++ Page cache tuning.

A new optional (expert) configuration parameter ={Cache}{TrackInternalLinks}=
is available for tuning how the cache tracks dependencies of topic references.
Default is =on= which is the same as prior releases. Foswiki will record
every topic link as a dependency. This can result in extrememly large cache
dependency tables, especially when using a WebLeftBar that displays a large
number of webs and/or topics.

Set this to =authenticated= to track these topic references only for logged in
users. Set to =off= (not recommended) to disable all reference link tracking.

The side effect of not tracking a link dependency is that cached pages will
not reflect updates that remove or add a topic.

Note that the PageCache should be globally flushed whenever any configuration
changes are made, or after updating Foswiki or any Extensions.

---+++ JQuery
This release updates to a newer maintenance version of JQuery. You should
visit =bin/configure= and select the updated versions of JQuery.
Expand Down Expand Up @@ -423,7 +447,7 @@ Foswiki thanks the Translators for their efforts. If you are interesting in hel
| [[%BUGS%/Item14309][Item14309]] | Old SVN based extensions don't compare as older than new Decimal versioned extensions. |
| [[%BUGS%/Item14312][Item14312]] | Don't destroy dialogs on close. |
| [[%BUGS%/Item14315][Item14315]] | ASSERT in Meta.pm when viewing prior revisions of topics with attachments. |
| [[%BUGS%/Item14317][Item14317]] | Under some conditions, JEditableContrib attempts to load an <code>.uncompressed.js</code> source, which is not in the distribution.
| [[%BUGS%/Item14317][Item14317]] | Under some conditions, JEditableContrib attempts to load an <code>.uncompressed.js</code> source, which is not in the distribution. |
| [[%BUGS%/Item14321][Item14321]] | Some InterwikiPlugin links are out of date. |

---+++ Enhancements
Expand Down
4 changes: 2 additions & 2 deletions core/lib/Foswiki.pm
View file
Expand Up @@ -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.2_002');
$RELEASE = 'Foswiki-2.1.3-Beta2';
use version 0.77; $VERSION = version->declare('v2.1.3');
$RELEASE = 'Foswiki-2.1.3';

# Default handlers for different %TAGS%
# Where an entry is set as 'undef', the tag will be demand-loaded
Expand Down
76 changes: 62 additions & 14 deletions core/tools/check_extensions.pl
View file
Expand Up @@ -10,17 +10,40 @@
use LWP::Simple;
use JSON;

my $extension = shift;
my $extension;
my $start;
my $nostate;
my $verbose;

my %items; # Hash to cache item # & descriptions.

use Getopt::Long;

GetOptions(
"extension=s" => \$extension,
"tag=s" => \$start, # string
"nostate" => \$nostate,
"verbose" => \$verbose,
'help' => sub {
help();
exit;

#Pod::Usage::pod2usage( -exitstatus => 0, -verbose => 2 );
},
) or die("Error in command line arguments\n");

# Tasks that are typically left open and not documented in release notes, eg. Documentation, Translation, etc.
my @omit = (qw(Item13883 Item13884 Item13504));
my @omit = (qw(Item000 Item13883 Item13884 Item13504));

my $start = `git describe --tags --abbrev=0`;
unless ($start) {
help();
die "Unable to locate starting tag.";

$start = `git describe --tags --abbrev=0`;
unless ($start) {
help();
die "Unable to locate starting tag.";
}
}

chomp $start;
print "checking for changes since $start\n";

Expand All @@ -34,8 +57,18 @@ sub help {
* The VERSION recorded in the .pm file should be > than the prior releases version.
* (SMELL: Does not account for interim releases of the extensioni)
* Commit Item* numbers are extracted from the git commit log and compared to the change log un the data/System/Extension.txt file.
* Commits are verified as being in "Waiting for Release"
* The check_manifest.pl script is run against the extension
The following command line options are accepted:
* -e | --extension: Specifiy the name of an extension to check
If the name of a Release is passed, the System.ReleaseNotesNNxNN topic is checked.
eg. check_extensions.pl -e Release02x01 will check System.ReleaseNotes02x01
* -t | --tag: Tag of the last release to use as base of commit list
* -n | --nostate: Don't report incorrect task state.
* -v | --verbose: Report unmodified extensions
* -h | --help: This help text.
END
}

Expand Down Expand Up @@ -68,8 +101,9 @@ END
if ( $extensions[0] =~ m/^Release/ ) {
my $release = $extensions[0];
my @itemlist;
my @missing;
my $gitlog = `git log --oneline $start..HEAD .`;
next
print "No commits in log range: $start..HEAD \n"
unless
$gitlog; # Comment this to get verbose report of unmodified extensions.
print "\n========== $release ============\n";
Expand All @@ -84,24 +118,32 @@ END
next if $item ~~ @omit;
$last = $item;
my $taskinfo = get_task_info($item);
print "WARNING: Wrong state: $taskinfo\n"
unless $taskinfo =~ m/Waiting for Release/;
if ( !$nostate ) {
print "WARNING: Wrong state: $taskinfo\n"
unless $taskinfo =~ m/Waiting for Release/;
}
next if $topicText =~ m/$item\b/;
print "MISSING: from change log: $taskinfo\n";
push @missing, "Foswikitask:$taskinfo";

}
print "MISSING From Changelog:\n" if ( scalar @missing );
foreach (@missing) {
print " $_\n";
}
}

}
else {

foreach my $ext ( sort @extensions ) {
my @missing;
chomp $ext;
chdir "$root/$ext";
my @itemlist;
my $gitlog = `git log --oneline $start..HEAD .`;
next
unless $gitlog
unless $verbose
|| $gitlog
; # Comment this to get verbose report of unmodified extensions.
print "\n========== $ext ============\n";
if ($gitlog) {
Expand All @@ -116,18 +158,24 @@ END
next if $item ~~ @omit;
$last = $item;
my $taskinfo = get_task_info($item);
print "WARNING: Wrong state: $taskinfo\n"
unless $taskinfo =~ m/Waiting for Release/;
if ( !$nostate ) {
print "WARNING: Wrong state: $taskinfo\n"
unless $taskinfo =~ m/Waiting for Release/;
}
next if $topicText =~ m/$item\b/;
print "MISSING: from change log: $taskinfo\n";
push @missing, "Foswikitask:$taskinfo";

}
}

else {
print "No changes since last release\n";
}

print "MISSING From Changelog:\n" if ( scalar @missing );
foreach (@missing) {
print " $_\n";
}

my $class = ( $ext =~ m/Plugin/ ) ? 'Plugins' : 'Contrib';
my $origsrc = `git show $start:$ext/lib/Foswiki/$class/$ext.pm`;

Expand Down

0 comments on commit d0676ea

Please sign in to comment.