Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'Release02x01'
  • Loading branch information
gac410 committed May 1, 2017
2 parents ff44aa7 + 3f7c5f2 commit 9276790
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 38 deletions.
33 changes: 17 additions & 16 deletions EditRowPlugin/data/System/EditRowPlugin.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1491353402" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1493666715" format="1.1" version="1"}%
---+!! !EditRowPlugin
<!--
One line description, required for extensions repository catalog.
Expand Down Expand Up @@ -271,7 +271,8 @@ Provides the vertical row editing interface like
Another great Foswiki extension from the <a style="text-decoration:none" href="http://wikiring.com"><img src="%ATTACHURLPATH%/wikiringlogo20x20.png" alt="" /> *WikiRing* </a> - working together to improve your wiki experience!

| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 3.318 (4 Apr 2017) | Foswikitask:Item14351: uninitialized value warning when changerows is used with EditRowPlugin |
| 3.318 (1 May 2017) | Foswikitask:Item14351: Uninitialized value warning when changerows is used with EditRowPlugin <br/>\
Foswikitask:Item14349: Edit Table button not functional on IE 11.|
| 3.317 (21 Jan 2017) | Foswikitask:Item14107 Document that move, add & delete row actions are immediate, not subject to cancel. |
| 3.316 (26 Nov 2016) | Foswikitask:Item14174 css.gz and js.gz files missing from MANIFEST<br/> \
Foswikitask:Item14213 Warning logged about uninitialized values <br/>\
Expand Down Expand Up @@ -351,17 +352,17 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
%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="http://foswiki.org/Extensions/EditRowPlugin"}%
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/EditRowPlugin"}%
%META:FILEATTACHMENT{name="icons.png" attr="h" comment="" date="1491353402" size="2457" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example3.png" attr="h" comment="" date="1491353402" size="15337" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example4.png" attr="h" comment="" date="1491353402" size="22834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.css" attr="h" comment="" date="1491353402" size="1454" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot2.png" attr="h" comment="" date="1491353402" size="12013" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.uncompressed.js" attr="h" comment="" date="1491353402" size="6803" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.js" attr="h" comment="" date="1491353402" size="11898" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.css" attr="h" comment="" date="1491353402" size="2130" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example5.png" attr="h" comment="" date="1491353402" size="9132" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.js" attr="h" comment="" date="1491353402" size="26625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1491353402" size="19461" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.js" attr="h" comment="" date="1491353402" size="3626" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1491353402" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="clock.gif" attr="h" comment="" date="1491353402" size="1418" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="icons.png" attr="h" comment="" date="1493666715" size="2457" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example3.png" attr="h" comment="" date="1493666715" size="15337" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example4.png" attr="h" comment="" date="1493666715" size="22834" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.css" attr="h" comment="" date="1493666715" size="1454" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot2.png" attr="h" comment="" date="1493666715" size="12013" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.uncompressed.js" attr="h" comment="" date="1493666715" size="6803" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.js" attr="h" comment="" date="1493666715" size="11898" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.css" attr="h" comment="" date="1493666715" size="2130" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="example5.png" attr="h" comment="" date="1493666715" size="9132" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="erp.uncompressed.js" attr="h" comment="" date="1493666715" size="26625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1493666715" size="19461" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="TableSort.js" attr="h" comment="" date="1493666715" size="3626" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1493666715" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="clock.gif" attr="h" comment="" date="1493666715" size="1418" user="ProjectContributor" version="1"}%
2 changes: 1 addition & 1 deletion EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin.pm
Expand Up @@ -33,7 +33,7 @@ BEGIN {
}

our $VERSION = '3.318';
our $RELEASE = '04 Apr 2017';
our $RELEASE = '01 May 2017';
our $SHORTDESCRIPTION = 'Inline edit for tables';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
25 changes: 12 additions & 13 deletions EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Table.pm
Expand Up @@ -340,17 +340,8 @@ sub render {
if ( $this->{attrs}->{disable} !~ /full/ ) {

# Full table editing is not disabled
my $title = "Edit full table";
my $button = Foswiki::Render::html(
'button',
{
type => 'button',
name => "erp_edit_${id}",
class => 'erp-edittable',
title => $title
}
);
my $url = Foswiki::Func::getScriptUrl(
my $title = "Edit full table";
my $url = Foswiki::Func::getScriptUrl(
$this->getWeb(), $this->getTopic(), 'view',
erp_topic => $active_topic,
erp_table => $id,
Expand All @@ -360,8 +351,16 @@ sub render {
push(
@out,
Foswiki::Render::html( 'a', { name => "erp_${id}" } )
. Foswiki::Render::html( 'a',
{ href => $url, title => $title }, $button )
. Foswiki::Render::html(
'a',
{
href => $url,
name => "erp_edit_${id}",
class => 'erp-edittable foswikiButton',
title => $title
},
''
)
. '<br />'
);
}
Expand Down
4 changes: 2 additions & 2 deletions EditRowPlugin/pub/System/EditRowPlugin/erp.uncompressed.css
Expand Up @@ -77,8 +77,8 @@ a.erp_drag_button:hover {
}

.erp-edittable {
width: 47px;
height: 20px;
width: 27px;
height: 13px;
background-image: url("icons.png") !important;
background-position:0 -16px;
}
Expand Down
3 changes: 3 additions & 0 deletions JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/Config.spec
Expand Up @@ -205,6 +205,9 @@ $Foswiki::cfg{JQueryPlugin}{Plugins}{'UI::Datepicker'}{Enabled} = 1;
# **BOOLEAN LABEL="UI::Dialog"**
$Foswiki::cfg{JQueryPlugin}{Plugins}{'UI::Dialog'}{Enabled} = 1;

# **BOOLEAN LABEL="UI::Draggable"**
$Foswiki::cfg{JQueryPlugin}{Plugins}{'UI::Draggable'}{Enabled} = 1;

# **BOOLEAN LABEL="UI::Progressbar"**
$Foswiki::cfg{JQueryPlugin}{Plugins}{'UI::Progressbar'}{Enabled} = 1;

Expand Down
3 changes: 2 additions & 1 deletion ModPerlEngineContrib/data/System/ModPerlEngineContrib.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1490657423" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1493597080" format="1.1" version="1"}%
---+!! !ModPerlEngineContrib
<!--
One line description, required for extensions repository catalog.
Expand Down Expand Up @@ -149,6 +149,7 @@ set in %USERSWEB%.SitePreferences, default taken from
---++ Info

| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 30 Apr 2017 (1.05) | Foswikitask:Item14381: Preserver URL Encoding of the Foswiki URI. |
| 26 Nov 2016 (1.04) | Released with Foswiki 2.1.3. Old Apache 1.x modules have been removed from the DEPENDENCIES file. |
| 08 Apr 2016 (1.03) | Foswikitask:Item14022 Change foswiki.org links to https. |
| 16 Jan 2016 (1.02) | Foswikitask:Item13926 Fix backwards compatibility with Foswiki 1.1. |
Expand Down
Expand Up @@ -23,8 +23,8 @@ use strict;

use vars qw( $VERSION $RELEASE $SHORTDESCRIPTION );

$VERSION = '1.04';
$RELEASE = '26 Nov 2016';
$VERSION = '1.05';
$RELEASE = '30 Apr 2017';
$SHORTDESCRIPTION = 'Permits Foswiki to be executed under mod_perl';

1;
4 changes: 3 additions & 1 deletion ModPerlEngineContrib/lib/Foswiki/Engine/Apache.pm
Expand Up @@ -153,7 +153,9 @@ sub preparePath {
$pathInfo = '/' . $action . $pathInfo;
}
$req->pathInfo($pathInfo);
my $uri = $this->{r}->uri;

#SMELL: CGI and FastCGI leave the URI encoded, mod_perl decodes it.
my $uri = Foswiki::urlEncode( $this->{r}->uri );
my $qs = $this->{r}->args;
$uri .= '?' . $qs if $qs;
$req->uri($uri);
Expand Down
5 changes: 3 additions & 2 deletions core/lib/Foswiki.pm
Expand Up @@ -1107,8 +1107,9 @@ sub generateHTTPHeaders {
# use our version of the content type
$hopts->{'Content-Type'} = $contentType;

$hopts->{'X-FoswikiAction'} = $this->{request}->action;
$hopts->{'X-FoswikiURI'} = $this->{request}->uri;
# These headers don't appear to be used, and can leak stuff.
$hopts->{'X-FoswikiAction'} = $this->{request}->action if DEBUG;
$hopts->{'X-FoswikiURI'} = $this->{request}->uri if DEBUG;

# Turn off XSS protection in DEBUG so it doesn't mask problems
$hopts->{'X-XSS-Protection'} = 0 if DEBUG;
Expand Down

0 comments on commit 9276790

Please sign in to comment.