From 3bb0d159d865a8101606de8b5146403be57f0913 Mon Sep 17 00:00:00 2001 From: Marco Ciampa Date: Sat, 16 Dec 2017 21:27:14 +0100 Subject: [PATCH 01/18] Item13884: Translated using Weblate (Italian) Currently translated at 100.0% (1232 of 1232 strings) --- core/locale/it.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/locale/it.po b/core/locale/it.po index 0ff137a3be..45c94ed17e 100644 --- a/core/locale/it.po +++ b/core/locale/it.po @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: it\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-01-20 08:06+0200\n" -"Last-Translator: Guido Brugnara \n" -"Language-Team: Italian \n" +"PO-Revision-Date: 2017-12-16 21:27+0200\n" +"Last-Translator: Marco Ciampa \n" +"Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5397,9 +5397,8 @@ msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "Attenzione: questo sito non permette l'%INCLUDE% degli URL" #: UpdatesPlugin/templates/updatesplugin.tmpl:11 -#, fuzzy msgid "Warning: Updates found for %1 extension(s): %2" -msgstr "Attenzione: Trovati aggiornamenti per %1 estensioni(e)." +msgstr "Attenzione: trovati aggiornamenti per %1 estensione(i): %2" #: TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm:449 msgid "Warning: \\'include\\' topic %1 does not exist!" From a60f49b4f752181eb1d41e5bf1cc8b542ce242d5 Mon Sep 17 00:00:00 2001 From: MichaelDaum Date: Mon, 18 Dec 2017 14:12:42 +0100 Subject: [PATCH 02/18] Item14585: fixed perl warnings --- core/pseudo-install.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/pseudo-install.pl b/core/pseudo-install.pl index 028ca1951a..06de205518 100755 --- a/core/pseudo-install.pl +++ b/core/pseudo-install.pl @@ -1141,9 +1141,10 @@ sub enablePlugin { my $changed = 0; if ( $cfg =~ - s/\$Foswiki::cfg{Plugins}{$module}{Enabled}\s*=\s*(\d+)[\s;]+//sg ) + s/\$Foswiki::cfg\{Plugins\}\{$module\}\{Enabled\}\s*=\s*(\d+)[\s;]+//sg + ) { - $cfg =~ s/\$Foswiki::cfg{Plugins}{$module}{Module}\s*=.*?;\s*//sg; + $cfg =~ s/\$Foswiki::cfg\{Plugins\}\{$module\}\{Module\}\s*=.*?;\s*//sg; # Removed old setting $changed = 1; From 68a2624ed58d7b9e5b518f3a3761ccd131ccbae3 Mon Sep 17 00:00:00 2001 From: MichaelDaum Date: Mon, 18 Dec 2017 18:12:40 +0100 Subject: [PATCH 03/18] Item14586: fixed height computation of textarea --- NatEditPlugin/data/System/NatEditPlugin.txt | 5 ++-- .../lib/Foswiki/Plugins/NatEditPlugin.pm | 4 +-- .../jquery.natedit.uncompressed.js | 26 +++++++++---------- .../NatEditPlugin/styles.uncompressed.css | 13 +++++----- NatEditPlugin/templates/edit.natedit.tmpl | 4 +-- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/NatEditPlugin/data/System/NatEditPlugin.txt b/NatEditPlugin/data/System/NatEditPlugin.txt index c027a5cb8c..608f89c531 100644 --- a/NatEditPlugin/data/System/NatEditPlugin.txt +++ b/NatEditPlugin/data/System/NatEditPlugin.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="" date="1512407001" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" comment="" date="1513617134" format="1.1" version="1"}% ---+!! Natural Edit Plugin %TOC% @@ -56,6 +56,7 @@ is sufficient. | Copyright ©: | 2007-2017 Michael Daum http://michaeldaumconsulting.com | | Change History: | | +| 18 Dec 2017 | Foswikitask:Item14586: fixed height computation of natedit textarea | | 04 Dec 2017 | Foswikitask:Item13835: enable !TopicTitle field when feature available | | 04 May 2017 | Foswikitask:Item14388: NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs.
Foswikitask:Item14404: NatEdit Save and Continue action fails on mod_perl systems. | @@ -184,4 +185,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="1512407001" size="64487" user="ProjectContributor" version="1"}% +%META:FILEATTACHMENT{name="screenshot1.png" attr="h" comment="" date="1513617134" size="64487" user="ProjectContributor" version="1"}% diff --git a/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm b/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm index 267ddc5296..a258dca406 100644 --- a/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm +++ b/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm @@ -30,8 +30,8 @@ BEGIN { } } -our $VERSION = '9.10'; -our $RELEASE = '04 Dec 2017'; +our $VERSION = '9.20'; +our $RELEASE = '18 Dec 2017'; our $NO_PREFS_IN_TOPIC = 1; our $SHORTDESCRIPTION = 'A Wikiwyg Editor'; our $baseWeb; diff --git a/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.uncompressed.js b/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.uncompressed.js index 6b26084f34..8c56e9ce92 100644 --- a/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.uncompressed.js +++ b/NatEditPlugin/pub/System/NatEditPlugin/jquery.natedit.uncompressed.js @@ -1711,14 +1711,9 @@ $.NatEditor.prototype.autoMaxExpand = function() { $.NatEditor.prototype.fixHeight = function() { var self = this, elem, - windowHeight = $(window).height() || window.innerHeight, tmceEdContainer = (typeof(tinyMCE) !== 'undefined' && tinyMCE.activeEditor)?$(tinyMCE.activeEditor.contentAreaContainer):null, - newHeight, - $debug = $("#DEBUG"); - - if (typeof(self.bottomHeight) === 'undefined') { - self.bottomHeight = $('.natEditBottomBar').outerHeight(true) + parseInt($('.jqTabContents').css('padding-bottom'), 10) * 2 + 2; - } + bottomBar = self.form.find(".natEditBottomBar"), + newHeight; if (tmceEdContainer && !tinyMCE.activeEditor.getParam('fullscreen_is_enabled') && tmceEdContainer.is(":visible")) { /* resize tinyMCE. */ @@ -1730,12 +1725,17 @@ $.NatEditor.prototype.fixHeight = function() { elem = $(self.txtarea); } - newHeight = windowHeight - elem.offset().top - self.bottomHeight - parseInt(elem.css('padding-bottom'), 10) *2 - 2; - - if ($debug.length) { - newHeight -= $debug.height(); + if (!elem || !elem.length) { + return; } + newHeight = + (bottomBar.length ? bottomBar.position().top : $(window).height() || window.innerHeight) // bottom position: if there is a bottomBar, take this, otherwise use the window's geometry + - elem.position().top // editor's top position + - (elem.outerHeight(true) - elem.height()) // elem's padding + - (self.container.outerHeight(true) - self.container.height()) // container's padding + - 4; + if (self.opts.minHeight && newHeight < self.opts.minHeight) { newHeight = self.opts.minHeight; } @@ -1745,10 +1745,10 @@ $.NatEditor.prototype.fixHeight = function() { } if (elem.is(":visible")) { - $.log("NATEDIT: fixHeight height=",newHeight); + //$.log("fixHeight height=",newHeight,"container.height=",self.container.height()); elem.height(newHeight); } else { - $.log("NATEDIT: not fixHeight elem not yet visible"); + //$.log("not fixHeight elem not yet visible"); } }; diff --git a/NatEditPlugin/pub/System/NatEditPlugin/styles.uncompressed.css b/NatEditPlugin/pub/System/NatEditPlugin/styles.uncompressed.css index f6d4cf0f3f..4f286538f0 100644 --- a/NatEditPlugin/pub/System/NatEditPlugin/styles.uncompressed.css +++ b/NatEditPlugin/pub/System/NatEditPlugin/styles.uncompressed.css @@ -3,10 +3,6 @@ margin:0; } -.ui-natedit-container { - margin-top:14px; -} - .natEditPreviewDialog, .ui-natedit-container .jqTabContents { overflow-x:hidden; @@ -163,8 +159,13 @@ /* bottom bar on save screen */ .natEditBottomBar { - margin-top:10px; - margin-bottom:10px; + position:fixed; + width:100%; + bottom:0; + left:0; + padding:0.5em 1em 1.5em; + background:#fff; + z-index:999; } .natEditBottomBar ul { margin:0px; diff --git a/NatEditPlugin/templates/edit.natedit.tmpl b/NatEditPlugin/templates/edit.natedit.tmpl index 62ec6d332a..3850c8fc23 100644 --- a/NatEditPlugin/templates/edit.natedit.tmpl +++ b/NatEditPlugin/templates/edit.natedit.tmpl @@ -48,7 +48,7 @@ %TMPL:END% -%TMPL:DEF{"textarea"}%%TMPL:END% +%TMPL:DEF{"textarea"}%%TMPL:END% %TMPL:DEF{"formend"}%%TMPL:END% @@ -64,7 +64,7 @@ %TMPL:P{"help"}% %TMPL:END% -%TMPL:DEF{"tabpane"}%%TABPANE{automaxexpand="on" minheight="330" animate="on" select="%URLPARAM{"natedittab" default="%TMPL:P{"selectedtab"}%"}%"}% +%TMPL:DEF{"tabpane"}%%TABPANE{class="plain" automaxexpand="on" animate="on" select="%URLPARAM{"natedittab" default="%TMPL:P{"selectedtab"}%"}%"}% %TMPL:P{"tabs"}%%ENDTABPANE%%TMPL:END% %TMPL:DEF{"tabs"}%%TMPL:P{"firsttab"}%%TMPL:P{"formfields"}%%TMPL:P{"settingstab"}%%TMPL:P{"permissionstab"}%%TMPL:P{"helptab"}%%TMPL:END% From bfde3b37634818658679499ab9cd642344c30ad0 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 18 Dec 2017 14:42:07 -0500 Subject: [PATCH 04/18] Item14138: Fixes for latest Email cpan modules They fail if the from email address is malformed. --- .../test/unit/MailerContrib/MailerContribSuite.pm | 7 +++++++ UnitTestContrib/test/unit/RegisterTests.pm | 1 + 2 files changed, 8 insertions(+) diff --git a/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm b/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm index 348e281d4b..359178b5c8 100644 --- a/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm +++ b/MailerContrib/test/unit/MailerContrib/MailerContribSuite.pm @@ -303,6 +303,13 @@ sub set_up { # OK, we should have a bunch of changes } +sub loadExtraConfig { + my $this = shift; + $this->SUPER::loadExtraConfig(@_); + + $Foswiki::cfg{WebMasterEmail} = 'admin@foswikitest.net'; +} + sub checkSpecs { my $this = shift; diff --git a/UnitTestContrib/test/unit/RegisterTests.pm b/UnitTestContrib/test/unit/RegisterTests.pm index a1b44e8f68..861d453806 100644 --- a/UnitTestContrib/test/unit/RegisterTests.pm +++ b/UnitTestContrib/test/unit/RegisterTests.pm @@ -185,6 +185,7 @@ sub loadExtraConfig { $Foswiki::cfg{Register}{EmailFilter} = ''; $Foswiki::cfg{Register}{NeedVerification} = 0; $Foswiki::cfg{Register}{NeedApproval} = 0; + $Foswiki::cfg{WebMasterEmail} = 'admin@foswikitest.net'; } sub tear_down { From fb45db297efa3729e03709299423cd896287f45f Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 18 Dec 2017 14:45:37 -0500 Subject: [PATCH 05/18] Item13380: Don't include current page in login URL This causes browsers to remember a unique entry for each page that promps for a login. The redirect after login is handled by the URL parameter, and not the Web/Topic in the login url. --- core/lib/Foswiki/LoginManager/TemplateLogin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/Foswiki/LoginManager/TemplateLogin.pm b/core/lib/Foswiki/LoginManager/TemplateLogin.pm index 028e81cd4b..7fa14581c9 100755 --- a/core/lib/Foswiki/LoginManager/TemplateLogin.pm +++ b/core/lib/Foswiki/LoginManager/TemplateLogin.pm @@ -119,7 +119,7 @@ sub loginUrl { my $session = $this->{session}; my $topic = $session->{topicName}; my $web = $session->{webName}; - return $session->getScriptUrl( 0, 'login', $web, $topic, + return $session->getScriptUrl( 0, 'login', undef, undef, foswiki_origin => _packRequest($session) ); } From 3f487ae34e832619b78f8c4e27228dc5002e1790 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 18 Dec 2017 16:33:03 -0500 Subject: [PATCH 06/18] Item14445: Need to include a -status return Fix unit tests that were expecting the 401. --- UnitTestContrib/test/unit/AccessControlTests.pm | 4 ++-- .../test/unit/AdminOnlyAccessControlTests.pm | 4 ++-- core/lib/Foswiki/LoginManager/TemplateLogin.pm | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/UnitTestContrib/test/unit/AccessControlTests.pm b/UnitTestContrib/test/unit/AccessControlTests.pm index a2f71e367f..0ba668f07d 100644 --- a/UnitTestContrib/test/unit/AccessControlTests.pm +++ b/UnitTestContrib/test/unit/AccessControlTests.pm @@ -946,8 +946,8 @@ THIS my ($status) = $text =~ m/^Status: (\d+)\r?$/m; $this->assert_not_null( $status, "Request did not return a Status header" ); - $this->assert_equals( 401, $status, - "Request should have returned a 401, not a $status" ); + $this->assert_equals( 200, $status, + "Request should have returned a 200, not a $status" ); # Extract what we've been redirected to my ($formAction) = diff --git a/UnitTestContrib/test/unit/AdminOnlyAccessControlTests.pm b/UnitTestContrib/test/unit/AdminOnlyAccessControlTests.pm index 4cbd671f45..1e749517d0 100644 --- a/UnitTestContrib/test/unit/AdminOnlyAccessControlTests.pm +++ b/UnitTestContrib/test/unit/AdminOnlyAccessControlTests.pm @@ -811,8 +811,8 @@ THIS # Check we got a 401 my ($status) = $text =~ m/^Status: (\d+)\r?$/m; $this->assert_not_null( $status, "Request did not return a Status header" ); - $this->assert_equals( 401, $status, - "Request should have returned a 401, not a $status" ); + $this->assert_equals( 200, $status, + "Request should have returned a 200, not a $status" ); # Extract what we've been redirected to my ($formAction) = diff --git a/core/lib/Foswiki/LoginManager/TemplateLogin.pm b/core/lib/Foswiki/LoginManager/TemplateLogin.pm index 7fa14581c9..37f19ac6a8 100755 --- a/core/lib/Foswiki/LoginManager/TemplateLogin.pm +++ b/core/lib/Foswiki/LoginManager/TemplateLogin.pm @@ -93,6 +93,18 @@ sub forceAuthentication { my $query = $session->{request}; my $response = $session->{response}; + # SMELL: This breaks some applications such as MS Excel. Return + # A 200 instead of a 401. + # Respond with a 401 with an appropriate WWW-Authenticate + # that won't be snatched by the browser, but can be used + # by JS to generate login info. + $response->header( + -status => 200, + + #-WWW_Authenticate => 'FoswikiBasic realm="' + # . ( $Foswiki::cfg{AuthRealm} || "" ) . '"' + ); + $query->param( -name => 'foswiki_origin', -value => _packRequest($session) From 7a0cc282a3bacc89157771766c352942948ce031 Mon Sep 17 00:00:00 2001 From: Vadim Belman Date: Mon, 18 Dec 2017 16:12:02 +0100 Subject: [PATCH 07/18] Item13884: Translated using Weblate (Ukrainian) Currently translated at 100.0% (1232 of 1232 strings) --- core/locale/uk.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/locale/uk.po b/core/locale/uk.po index e8acfa18c5..6b127ee92b 100644 --- a/core/locale/uk.po +++ b/core/locale/uk.po @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: Foswiki $ld\n" "Report-Msgid-Bugs-To: foswiki-svn@lists.sourceforge.net\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2016-12-29 22:21+0200\n" +"PO-Revision-Date: 2017-12-18 16:12+0200\n" "Last-Translator: Vadim Belman \n" "Language-Team: \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.4\n" "X-Poedit-Language: Ukrainian\n" "X-Poedit-Country: UKRAINE\n" @@ -5335,9 +5335,8 @@ msgstr "" "Увага: Цей сайт не дозволяє використовувати %INCLUDE% для URL адрес" #: UpdatesPlugin/templates/updatesplugin.tmpl:11 -#, fuzzy msgid "Warning: Updates found for %1 extension(s): %2" -msgstr "Увага: Знайдено оновлення для %1 розширень(я)." +msgstr "Увага! Знайдено оновлення для %1 розширень(я): %2" #: TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm:449 msgid "Warning: \\'include\\' topic %1 does not exist!" From 369eef99767206824179afab6e8862613907d869 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 18 Dec 2017 16:51:53 -0500 Subject: [PATCH 08/18] Item13883: Prepare to build Beta 2 --- core/data/System/ReleaseHistory.txt | 4 ++-- core/data/System/ReleaseNotes02x01.txt | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt index e0d13758cb..6b6dd77617 100644 --- a/core/data/System/ReleaseHistory.txt +++ b/core/data/System/ReleaseHistory.txt @@ -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-Beta1 - 16 Dec 2017 +---++ Foswiki Release 2.1.5-Beta2 - 18 Dec 2017 -Foswiki 2.1.5-Beta1 was built on 16 Dec 2017. It is a release that contains 35 fixes and 5 enhancements. +Foswiki 2.1.5-Beta2 was built on 16 Dec 2017. It is a release that contains 38 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 eb0de978e3..0b9fa1628e 100644 --- a/core/data/System/ReleaseNotes02x01.txt +++ b/core/data/System/ReleaseNotes02x01.txt @@ -1,6 +1,6 @@ %META:TOPICINFO{author="ProjectContributor" date="1513438812" format="1.1" version="1"}% %META:TOPICPARENT{name="ReleaseHistory"}% ----+!! Foswiki Release 2.1.5-Beta1 +---+!! Foswiki Release 2.1.5-Beta2 %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-Beta1 was built on 16 Dec 2017. It is a release that contains 35 fixes and 5 enhancements. + * Foswiki 2.1.5-Beta2 was built on 18 Dec 2017. It is a release that contains 38 fixes and 5 enhancements. ---++ Pre-installed Extensions @@ -92,12 +92,15 @@ function correctly without this zone. No changes are required unless you have replaced the =foswiki.tmpl= or =foswiki.pattern.tmpl= with a local version. ----+++ Cnange in HTTP status return for authentication failures. +---+++ Change in HTTP status return for authentication failures. The fix for Foswikitask:Item14445 changes the HTTP status return for authentiation errors from =401 - Unauthorized= to =200 - OK= when returning the Template Login screen. The 401 status is not valid unless it returns a WWW-Authentication challenge that can be processed by the _agent_. This is only valid when using HTTP authentication. The REST and JSONRPC actions will still return a 401, so that it can be handled by javascript. +*Note:* This change requires a corresponding fix for the !LdapContrib. If you use the !LdapContrib, you should not apply this release until an update of +!LdapContrib is available. + ---+++ 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 @@ -546,6 +549,7 @@ Foswiki thanks the Translators for their efforts. If you are interesting in hel | [[%BUGS%/Item11491][Item11491]] | FCGI has de facto file upload limit - add note in documentation for fix. | | [[%BUGS%/Item12495][Item12495]] | In form fields of type "select", space after a value and before the delimiting comma makes the value selectable and it saves but will reset on next edit. | | [[%BUGS%/Item13350][Item13350]] | Document why Mailnotify appears to skip notification of some changes. | +| [[%BUGS%/Item13380][Item13380]] | Remove the Web/Topic from the login URL to prevent flooding the browser password cache. | | [[%BUGS%/Item13835][Item13835]] | Title Field in Natedit gone, even when used. | | [[%BUGS%/Item14395][Item14395]] | InterwikiPlugin failure to check result from readTopic causes error. | | [[%BUGS%/Item14415][Item14415]] | TopicUserMapping places non-ASCII users in wrong position in WikiUsersTopic. | @@ -578,6 +582,8 @@ Foswiki thanks the Translators for their efforts. If you are interesting in hel | [[%BUGS%/Item14566][Item14566]] | Don't cache a null result in foswiki.getPreference(). | | [[%BUGS%/Item14573][Item14573]] | Fix auto-height calculation of tabpane. | | [[%BUGS%/Item14574][Item14574]] | HTML cellspacing attribute has no effect. | +| [[%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. | ---+++ Enhancements From 85b740284e8bfc3bf9b7eb56ca9fcd3478c81313 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 18 Dec 2017 17:07:05 -0500 Subject: [PATCH 09/18] Item13883: Update release notes for 2.1.5 --- JQueryPlugin/data/System/JQueryPlugin.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/JQueryPlugin/data/System/JQueryPlugin.txt b/JQueryPlugin/data/System/JQueryPlugin.txt index 6d88623843..2b7e518640 100644 --- a/JQueryPlugin/data/System/JQueryPlugin.txt +++ b/JQueryPlugin/data/System/JQueryPlugin.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="" date="1512791273" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" comment="" date="1513634809" format="1.1" version="1"}% ---+!! %TOPIC% %FORMFIELD{"Description"}% @@ -128,7 +128,8 @@ required for Foswiki 1.1 or later. | 11 Dec 2017: | (7.25) - Item14565: bundle jquery.validate js files into one
\ Item14566: don't cache a null result in foswiki.getPreference()
\ Item14570: add "use strict" to farbtastic's init and fix js errors
\ - Item14573: fixed auto-height calculation of tabpane | + Item14573: fixed auto-height calculation of tabpane
\ + Item14584: jquery.wikiword changed interpretation of source parameter in a incompatible way. | | 8 Dec 2017: | (7.24) - Released with Foswiki 2.1.5
\ Item14518: JQueryPlugin should warn configure if an older version of jquery is selected.
\ Item14555: make build work with latest uglifyjs 3.
\ From 49dda65d50e8f8099020fbbc4bdb07d42a3bc770 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 18 Dec 2017 19:59:11 -0500 Subject: [PATCH 10/18] Item000: Build 2.1.5-Beta2 --- 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 9e6f9ca149..4f5287eaed 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_001'); - $RELEASE = 'Foswiki-2.1.5-Beta1'; + use version 0.77; $VERSION = version->declare('v2.1.4_002'); + $RELEASE = 'Foswiki-2.1.5-Beta2'; # Default handlers for different %TAGS% # Where an entry is set as 'undef', the tag will be demand-loaded From e706d77e205a1fa0ecb854fd8ef57cb9f0cd4826 Mon Sep 17 00:00:00 2001 From: CH yang Date: Wed, 20 Dec 2017 02:27:27 +0100 Subject: [PATCH 11/18] Item13884: Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1232 of 1232 strings) --- core/locale/zh-tw.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/locale/zh-tw.po b/core/locale/zh-tw.po index 45b367d76d..6b55981a0a 100644 --- 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-svn@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: foswiki-develop@lists.foswiki.org\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2017-01-31 09:15+0200\n" +"PO-Revision-Date: 2017-12-20 02:27+0200\n" "Last-Translator: CH yang \n" -"Language-Team: Traditional Chinese \n" +"Language-Team: Traditional Chinese " +"\n" "Language: zh-tw\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5115,9 +5115,8 @@ msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "警告: 本網站不允許 %INCLUDE% 連結" #: UpdatesPlugin/templates/updatesplugin.tmpl:11 -#, fuzzy msgid "Warning: Updates found for %1 extension(s): %2" -msgstr "警告: 找到擴充 %1 的更新。" +msgstr "警告: 找到擴充 %1 的更新: %2" #: TablePlugin/lib/Foswiki/Plugins/TablePlugin/Core.pm:449 msgid "Warning: \\'include\\' topic %1 does not exist!" From ffa069d62dae94385c40d112daf5fc1e6b88b291 Mon Sep 17 00:00:00 2001 From: CH yang Date: Wed, 20 Dec 2017 02:31:40 +0100 Subject: [PATCH 12/18] Item13884: Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (1232 of 1232 strings) --- core/locale/zh-tw.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/locale/zh-tw.po b/core/locale/zh-tw.po index 6b55981a0a..181e8e8af6 100644 --- a/core/locale/zh-tw.po +++ b/core/locale/zh-tw.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Foswiki $Id\n" "Report-Msgid-Bugs-To: foswiki-develop@lists.foswiki.org\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" -"PO-Revision-Date: 2017-12-20 02:27+0200\n" +"PO-Revision-Date: 2017-12-20 02:31+0200\n" "Last-Translator: CH yang \n" "Language-Team: Traditional Chinese " "\n" @@ -922,7 +922,7 @@ msgstr "基本子網 %1 遺失或不存在" #: NatEditPlugin/templates/edittoolbar.natedit.tmpl:35 msgid "Blockquote" -msgstr "區塊引用" +msgstr "引用區塊" #: NatEditPlugin/templates/edittoolbar.natedit.tmpl:42 msgid "Bold" From a7a600844b25fd64b255bdf0e139a228704cac40 Mon Sep 17 00:00:00 2001 From: George Clark Date: Sat, 23 Dec 2017 10:44:19 -0500 Subject: [PATCH 13/18] Item14588: MailerContrib fills debug log with warnings Complains about surprise or missing mappings, because Web.WikiName != WikiName --- MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm b/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm index 5b538312a1..a297ebe9e6 100644 --- a/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm +++ b/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm @@ -375,7 +375,7 @@ sub _loadUserPreferences { my $meta = $email2meta->{$email}; unless ( defined $meta ) { - my @wn = Foswiki::Func::emailToWikiNames($email); + my @wn = Foswiki::Func::emailToWikiNames( $email, 1 ); # If the email maps to a single user, we can use their # preferences. From dc4dd077be440705d60e477721b77d75cb131f7a Mon Sep 17 00:00:00 2001 From: George Clark Date: Sat, 23 Dec 2017 11:00:24 -0500 Subject: [PATCH 14/18] Item14588: Update release notes --- MailerContrib/data/System/MailerContrib.txt | 11 ++++++----- MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm | 2 +- core/data/System/ReleaseNotes02x01.txt | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/MailerContrib/data/System/MailerContrib.txt b/MailerContrib/data/System/MailerContrib.txt index 5bac7442f7..dff347e364 100644 --- a/MailerContrib/data/System/MailerContrib.txt +++ b/MailerContrib/data/System/MailerContrib.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="" date="1513094554" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" comment="" date="1514044811" format="1.1" version="1"}% %META:TOPICPARENT{name="Contribs"}% ---+!! Mailer Contrib @@ -274,9 +274,10 @@ Many thanks to the following sponsors for supporting this work: | Copyright ©: | 2004, Wind River Systems; 2009-2014 Foswiki Contributors | | Change History: | | -| 2.85 (8 Dec 2017) | Foswiki 2.1.5 Foswikitask:Item14554: remove link to unused wikiring.com domain.
\ +| 2.85 (23 Dec 2017) | Foswiki 2.1.5 Foswikitask:Item14554: remove link to unused wikiring.com domain.
\ Foswikitask:Item13350: Mailnotify appears to skip notification of some changes.
\ - Foswikitask:Item14446: Unwritable =work_area= results in mega-spam. | + Foswikitask:Item14446: Unwritable =work_area= results in mega-spam.
\ + Foswikitask:Item14588: mailnotify fills debug log with errors about "surprising mapping" and "missing mapping". | | 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
\ Foswikitask:Item14216: mailnotify fails with "Wide character in print" | @@ -322,5 +323,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="1513094554" size="11437" user="ProjectContributor" version="1"}% -%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1513094554" size="1343" user="ProjectContributor" version="1"}% +%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"}% diff --git a/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm b/MailerContrib/lib/Foswiki/Contrib/MailerContrib.pm index a297ebe9e6..d91fec2000 100644 --- 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 = '8 Dec 2017'; +our $RELEASE = '23 Dec 2017'; our $SHORTDESCRIPTION = 'Supports email notification of changes'; # PROTECTED STATIC ensure the contrib is internally initialised diff --git a/core/data/System/ReleaseNotes02x01.txt b/core/data/System/ReleaseNotes02x01.txt index 0b9fa1628e..d48a4293a7 100644 --- a/core/data/System/ReleaseNotes02x01.txt +++ b/core/data/System/ReleaseNotes02x01.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1513438812" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1514044811" format="1.1" version="1"}% %META:TOPICPARENT{name="ReleaseHistory"}% ---+!! Foswiki Release 2.1.5-Beta2 @@ -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-Beta2 was built on 18 Dec 2017. It is a release that contains 38 fixes and 5 enhancements. + * Foswiki 2.1.5-RC was built on xx Dec 2017. It is a release that contains 39 fixes and 5 enhancements. ---++ Pre-installed Extensions @@ -584,6 +584,7 @@ Foswiki thanks the Translators for their efforts. If you are interesting in hel | [[%BUGS%/Item14574][Item14574]] | HTML cellspacing attribute has no effect. | | [[%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". | ---+++ Enhancements From 7a235028a5bca576ea0e3c7c106b20ea76d97b91 Mon Sep 17 00:00:00 2001 From: George Clark Date: Thu, 4 Jan 2018 10:03:33 -0500 Subject: [PATCH 15/18] Item14589: Fix typo in settings editor help link. --- core/templates/settings.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/settings.tmpl b/core/templates/settings.tmpl index 110168131a..08929882e6 100644 --- a/core/templates/settings.tmpl +++ b/core/templates/settings.tmpl @@ -22,7 +22,7 @@ %TMPL:DEF{"help"}% - * %POPUPWINDOW{"%SYSTEMWEB%.PreferencesSettings" label="%MAKETEXT{"Get help on setting topic preferences"}%"}%%JQREQUIRE{"popupwindow"}% + * %POPUPWINDOW{"%SYSTEMWEB%.PreferenceSettings" label="%MAKETEXT{"Get help on setting topic preferences"}%"}%%JQREQUIRE{"popupwindow"}% * %MAKETEXT{"Each preference has the syntax"}%
%MAKETEXT{"~[multiple of 3 spaces~] * ~[space~] Set ~[space~] VARIABLENAME ~[space~] = ~[value~]"}% %TMPL:END% From 2e6136590d12eabee7abb34a4a418a6c2f5eda0d Mon Sep 17 00:00:00 2001 From: MichaelDaum Date: Fri, 5 Jan 2018 10:22:30 +0100 Subject: [PATCH 16/18] Item14590: added closing tag in html diff --- MailerContrib/templates/mailnotify.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MailerContrib/templates/mailnotify.tmpl b/MailerContrib/templates/mailnotify.tmpl index b4f98d7f32..a1ef06329e 100644 --- a/MailerContrib/templates/mailnotify.tmpl +++ b/MailerContrib/templates/mailnotify.tmpl @@ -49,7 +49,7 @@ %TMPL:END% -------------------------------- %TMPL:DEF{HTML:diff}%- %TOPIC% (%AUTHOR%, %TIME%) %REVISION% - %SCRIPTURL{"view"}%/%ENCODE{%WEB%}%/%ENCODE{%TOPIC%}% + %SCRIPTURL{"view"}%/%ENCODE{%WEB%}%/%ENCODE{%TOPIC%}% %TEXTHEAD% %TMPL:END% -------------------------------- From f10e35343ead12a45699db6e8c11bb8c5eb8d76c Mon Sep 17 00:00:00 2001 From: MichaelDaum Date: Fri, 5 Jan 2018 11:47:29 +0100 Subject: [PATCH 17/18] Item14591: fixed reading old revisions Don't care about timestamps on disk. ALWAYS return the revision the user has asked for. --- RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsWrapHandler.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsWrapHandler.pm b/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsWrapHandler.pm index 35d69f0a38..d951efaea5 100644 --- a/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsWrapHandler.pm +++ b/RCSStoreContrib/lib/Foswiki/Store/Rcs/RcsWrapHandler.pm @@ -262,8 +262,7 @@ sub getRevision { # If there is no revision history, or if $version is not given, # or there is a checkin pending, then consult the .txt if ( !$this->revisionHistoryExists() - || !$version - || !$this->noCheckinPending() ) + || !$version) { # Get the latest rev from the cache From 821a3105f2474b0c06fc036e5892af68fa9874cc Mon Sep 17 00:00:00 2001 From: MichaelDaum Date: Fri, 5 Jan 2018 11:51:10 +0100 Subject: [PATCH 18/18] Item14591: docu --- RCSStoreContrib/data/System/RCSStoreContrib.txt | 3 ++- RCSStoreContrib/lib/Foswiki/Contrib/RCSStoreContrib.pm | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/RCSStoreContrib/data/System/RCSStoreContrib.txt b/RCSStoreContrib/data/System/RCSStoreContrib.txt index 34c4fbce94..130a28c85f 100644 --- a/RCSStoreContrib/data/System/RCSStoreContrib.txt +++ b/RCSStoreContrib/data/System/RCSStoreContrib.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1491353912" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1515149448" format="1.1" version="1"}%   | +| 1.10 (5 Jan 2018): | Foswikitask:Item14591: Fixed loading old revisions | | 1.06 (4 Apr 2017): | Foswikitask:Item14368: Failure to handle edge cases leads to obscure bug. | | 1.05 (26 Nov 2016): | Released wth Foswiki 2.1.3
\ Foswikitask:Item14066: performance issue sorting topic list based on NFKD. | diff --git a/RCSStoreContrib/lib/Foswiki/Contrib/RCSStoreContrib.pm b/RCSStoreContrib/lib/Foswiki/Contrib/RCSStoreContrib.pm index 6352be8ad2..44b8be0555 100644 --- a/RCSStoreContrib/lib/Foswiki/Contrib/RCSStoreContrib.pm +++ b/RCSStoreContrib/lib/Foswiki/Contrib/RCSStoreContrib.pm @@ -19,8 +19,8 @@ use warnings; use Foswiki::Configure::Load; -our $VERSION = '1.06'; -our $RELEASE = '4 Apr 2017'; +our $VERSION = '1.10'; +our $RELEASE = '5 Jan 2018'; our $SHORTDESCRIPTION = 'A wiki topic and attachment store using the RCS revision control system';