Skip to content

Commit

Permalink
Item13883: Merge branch 'Release02x01'
Browse files Browse the repository at this point in the history
  • Loading branch information
gac410 committed Dec 9, 2017
2 parents 4903a70 + 4ecda68 commit 5f7ee11
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions ConfigurePlugin/data/System/ConfigurePlugin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ However this UI provides a simple way to access the configuration without
requiring login access to the server.

If your system has an existing !LocalSite.cfg, then you *must* be
logged in to %WIKITOOLNAME% as an administrator, or as a user identified by the
logged in to %WIKITOOLNAME% as an administrator, or as a user identified by the
={FeatureAccess}{Configure}= parameter before attempting to use
this interface. If no !LocalSite.cfg exists, then you will automatically
logged in as an admin. Do not log out of Foswiki until you have done one or
Expand Down Expand Up @@ -45,7 +45,7 @@ The plugin uses the =JsonRpcContrib=, which must be installed.
| 08 Dec 2017: | (1.09) Foswikitask:Item14536: Configure leaves "wait" cursor spinning while waiting for user action.<br/>\
Foswikitask:Item14472: replaced use of =attr()= with =prop()= where needed; fixed use of =null= value trying to trim values |
| 04 Apr 2017: | (1.08) Foswikitask:Item13883: Updated base template to suggest solutions when configure shows base login page.<br/>\
Foswikitask:Item13339: Warning or errors icons in configure get stuck unless page is reloaded.<br/>\
Foswikitask:Item13339: Warning or errors icons in configure get stuck unless page is reloaded.<br/>\
Foswikitask:Item14366: Reorder initialization to allow local CGI::Carp |
| 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 |
Expand Down
12 changes: 6 additions & 6 deletions JQueryPlugin/data/System/JQueryPlugin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ required for Foswiki 1.1 or later.

---++ Change History
%TABLE{columnwidths="7em" tablewidth="100%"}%
| 8 Dec 2017: | (7.24) - Releaseed with Foswiki 2.1.5<br>\
Item14518: JQueryPlugin should warn configure if an older version of jquery is selected.<br/>\
Item14555: make build work with latest uglifyjs 3.<br/>\
| 8 Dec 2017: | (7.24) - Released with Foswiki 2.1.5<br>\
Item14518: JQueryPlugin should warn configure if an older version of jquery is selected.<br/>\
Item14555: make build work with latest uglifyjs 3.<br/>\
Item14559: regression via Item13898 - broken topic selectors.<br/>\
Item14560: wikiword changes don't trigger a change event on the target element. |
| 4 May 2017: | (7.23) - Item14372: JQueryPlugin ui-draggable got dropped from Config.spec. |
Expand Down Expand Up @@ -195,7 +195,7 @@ required for Foswiki 1.1 or later.
Item12583: revert version string to simple float not to break installation on RHEL and SLES \
Item12599: use jQuery-1.9x (not 2.0.x) for IE9 \
Item12600: various minor changes to jquery components |
| 12 Oct 2013: | (4.83) - Item12567: fix version check in =configure= (not released) |
| 12 Oct 2013: | (4.83) - Item12567: fix version check in =configure= (not released) |
| 07 Jun 2013: | (4.82) - Item12528: fixed char mapping in jquery.wikiword |
| 31 May 2013: | (4.81) - Item12520: added jquery-1.10.1 and jquery-2.0.2 |
| 30 May 2013: | (4.80) - Item12519: upgraded superfish, supersubs and hoverintent |
Expand All @@ -220,7 +220,7 @@ required for Foswiki 1.1 or later.
| 01 Jun 2012: | (4.42) - Item11917: simplemodal updated to 1.4.2. fixed upstream bug computing dialog heights |
| 23 May 2012: | (4.41) - Item11889: \
added means to hide the close button on textboxlist values; \
docu improvements to textboxlixst and pnotify |
docu improvements to textboxlixst and pnotify |
| 10 Apr 2012: | (4.40) - Item11397, Item11742: \
use a JSON instead of &lt;meta> to export preferences to javascript; \
add jquery-1.7.2 (new default); \
Expand Down Expand Up @@ -296,7 +296,7 @@ required for Foswiki 1.1 or later.
added new jquery-ui theme flickr; \
update forms plugin to 2.49 to improve jQuery 1.4 compatibility |
| 27 Oct 2010: | (3.75) fixed IE error in chili recipe for TML |
| 19 Oct 2010: | (3.74) Version included with Foswiki 1.1.0 + fix for code bug in SLIMBOX causing !ImageGalleryPlugin to fail |
| 19 Oct 2010: | (3.74) Version included with Foswiki 1.1.0 + fix for code bug in SLIMBOX causing !ImageGalleryPlugin to fail |
| 19 Aug 2010: | (3.71) JQueryLiveQuery now loads by default; \
removed JQueryBgiframe and JQueryEasing plugins from default plugins |
| 02 Jul 2010: | (3.70) removed outdated spinner and ifixpng plugins; \
Expand Down
6 changes: 3 additions & 3 deletions PatternSkin/data/System/PatternSkin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +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; |
| 8 Dec 2017 | v.6.11: Foswikitask:Item14434: Translated text with reserved characters used in System.WebCreateNewTopicComponents will create wrong HTML<br/>\
Foswikitask:Item14488: PatternSkin is missing "body" zone used by NatSkin and many extensions.<br/>\
Foswikitask:Item14556: clean up header area. |
| 8 Dec 2017 | v.6.11: Foswikitask:Item14434: Translated text with reserved characters used in System.WebCreateNewTopicComponents will create wrong HTML<br/>\
Foswikitask:Item14488: PatternSkin is missing "body" zone used by NatSkin and many extensions.<br/>\
Foswikitask:Item14556: clean up header area. |
| 4 Apr 2017 | V.6.10: Foswikitask:Item13883: Fix HTML errors in PatternSkinElements. |
| 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. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ It's a part of the default distribution of the Foswiki Core.

| Contrib Author(s): | Copyright (C) 2007-2017 Sven Dowideit, SvenDowideit@WikiRing.com and Project Contributors. |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 4.57 (08 Dec 2017) | Release with Foswiki 2.1.5<br/>\
| 4.57 (08 Dec 2017) | Release with Foswiki 2.1.5<br/>\
Foswikitask:Item14415: TopicUserMapping places non-ASCII users in wrong position in WikiUsers Topic.<br/>\
Foswikitask:Item14460: Login/Logon actions should create session when guest sessions are disabled. |
| 4.56 (23 Jan 2017) | Release with Foswiki-2.1.3<br/>\
Expand Down

0 comments on commit 5f7ee11

Please sign in to comment.