Skip to content

Commit

Permalink
Item000: Merge branch 'Release02x01'
Browse files Browse the repository at this point in the history 
Merge 2.1.1. RC2
  • Loading branch information
@gac410
gac410 committed Apr 25, 2016
2 parents 602172b + d6a2ce4 commit a3def4d
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 25 deletions.
8 changes: 4 additions & 4 deletions JQueryPlugin/data/System/JQueryMasonry.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1456220586" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1461624105" format="1.1" version="1"}%
%META:TOPICPARENT{name="JQueryPlugin"}%
---+ %TOPIC%
%JQPLUGINS{"masonry"
Expand All @@ -12,7 +12,7 @@
%STARTSECTION{"summary"}%
Masonry is a <nop>JavaScript grid layout library. It works by placing elements in optimal
position based on available vertical space, sort of like a mason fitting stones in a wall.
You’ve probably seen it in use all over the Internet.
You've probably seen it in use all over the Internet.
%ENDSECTION{"summary"}%

---++ Screenshot
Expand Down Expand Up @@ -70,7 +70,7 @@ All options are optional, but columnWidth and itemSelector are recommended.
* =isOriginLeft: true= %BR%
Controls the horizontal flow of the layout. By default, item elements start positioning at the left, with =isOriginLeft: true=. Set =isOriginLeft: false= for right-to-left layouts.
* =isOriginTop: true= %BR%
Controls the vertical flow of the layout. By default, item elements start positioning at the top, with =isOriginTop: true=. Set =isOriginTop: false= for bottom-up layouts. It’s like Tetris!
Controls the vertical flow of the layout. By default, item elements start positioning at the top, with =isOriginTop: true=. Set =isOriginTop: false= for bottom-up layouts. It's like Tetris!
* =containerStyle: {position:relative}= %BR%
CSS styles that are applied to the container element, set to =null= to disable any css
* =transitionDuration: '0.4s'=
Expand Down Expand Up @@ -155,4 +155,4 @@ See more demos at http://masonry.desandro.com/
</style>
</literal>

%META:FILEATTACHMENT{name="jQuery-Masonry.jpg" attr="h" comment="" date="1456220586" size="35840" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jQuery-Masonry.jpg" attr="h" comment="" date="1461624105" size="35840" user="ProjectContributor" version="1"}%
29 changes: 15 additions & 14 deletions TwistyPlugin/data/System/TwistyPlugin.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1437500521" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1461594420" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! <nop>%TOPIC%

Expand Down Expand Up @@ -478,6 +478,7 @@ You can override some default settings in the plugin by setting the following [[
---++ Plugin Info

| Change&nbsp;History: | <!-- versions below in reverse order -->&nbsp; |
| 25 Apr 2016 | 1.63 Bump version due to minor documentation updates. Released with Foswiki 2.1.1 |
| 17 Jun 2014 | 1.62 Foswikitask:Item12597: Expand/Collapse all is acting as a toggle.<br />\
Foswikitask:Item12694 Default to fast animation speed.<br/>\
Foswikitask:Item12583: Change to simple decimal version,<br/>\
Expand Down Expand Up @@ -536,16 +537,16 @@ You can override some default settings in the plugin by setting the following [[
%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/copyleft/gpl.html][GPL]]"}%
%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="twisty.css" attr="h" comment="" date="1437500521" size="27" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.uncompressed.css" attr="h" comment="" date="1437500521" size="33" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.js.gz" attr="h" comment="" date="1437500521" size="1125" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.uncompressed.js" attr="h" comment="" date="1437500521" size="7676" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.css.gz" attr="h" comment="" date="1437500521" size="20" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.js" attr="h" comment="" date="1437500521" size="4857" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.js.gz" attr="h" comment="" date="1437500521" size="1275" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.js" attr="h" comment="" date="1437500521" size="4439" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.uncompressed.css" attr="h" comment="" date="1437500521" size="0" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.css.gz" attr="h" comment="" date="1437500521" size="47" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.uncompressed.js" attr="h" comment="" date="1437500521" size="10828" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1437500521" size="181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.css" attr="h" comment="" date="1437500521" size="0" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.css" attr="h" comment="" date="1461594420" size="27" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.uncompressed.css" attr="h" comment="" date="1461594420" size="33" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.js.gz" attr="h" comment="" date="1461594420" size="1125" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.uncompressed.js" attr="h" comment="" date="1461594420" size="7676" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.css.gz" attr="h" comment="" date="1461594420" size="20" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.js" attr="h" comment="" date="1461594420" size="4857" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.js.gz" attr="h" comment="" date="1461594420" size="1275" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.js" attr="h" comment="" date="1461594420" size="4439" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.uncompressed.css" attr="h" comment="" date="1461594420" size="0" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="twisty.css.gz" attr="h" comment="" date="1461594420" size="47" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.uncompressed.js" attr="h" comment="" date="1461594420" size="10828" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1461594420" size="181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="jquery.twisty.css" attr="h" comment="" date="1461594420" size="0" user="ProjectContributor" version="1"}%
6 changes: 3 additions & 3 deletions TwistyPlugin/lib/Foswiki/Plugins/TwistyPlugin.pm
View file
Expand Up @@ -17,8 +17,8 @@ use warnings;
use vars qw( @twistystack $doneHeader $doneDefaults $twistyCount
$prefMode $prefShowLink $prefHideLink $prefRemember);

our $VERSION = '1.62';
our $RELEASE = '1.62';
our $VERSION = '1.63';
our $RELEASE = '1.63';
our $SHORTDESCRIPTION =
'Twisty section Javascript library to open/close content dynamically';
our $NO_PREFS_IN_TOPIC = 1;
Expand Down Expand Up @@ -449,7 +449,7 @@ sub _wrapInContainerDivIfNoJavascripClose {
__END__
Foswiki - The Free and Open Source Wiki, http://foswiki.org/
Copyright (C) 2008-2014 Foswiki Contributors. Foswiki Contributors
Copyright (C) 2008-2016 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
4 changes: 2 additions & 2 deletions core/data/System/InstallationGuide.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1460338963" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1461596274" format="1.1" version="1"}%
%META:TOPICPARENT{name="AdminDocumentationCategory"}%
<noautolink>
---+!! Installation Guide
Expand Down Expand Up @@ -138,7 +138,7 @@ In details:
%T% *General points to keep in mind with any of the above Apache configuration approaches:*
* For security purposes, it's important to check that web access is denied to all Foswiki subdirectories other than =bin= and =pub=. All three of the approaches described above (Foswiki:Support.ApacheConfigGenerator, the sample =foswiki_httpd_conf.txt= file included in the distribution, or =.htaccess= files) should provide for this but it should be confirmed by using web browser to confirm that direct access to the other directories is blocked.
* Also for security purposes, be sure to turn off any kind of PHP, Perl, Python, Server Side Includes, or other software execution mechanisms supported by your web server in the =pub= directory. Again, the three approaches described above all provide for this. However, different script execution mechanisms are disabled in different ways so refer see your web server configuration and documentation for more details.
* The configuration shipped with Foswiki is for Apache 2.2 or earlier. Apache 2.4 has changed the syntax of the configuration file. Ensure that =mod_access_compat= is enabled for backwards compatibility when using Apache 2.4, or use the updated Foswiki:Support.ApacheConfigGenerator24 config generator.
* The configuration shipped with Foswiki is for Apache 2.2 or earlier. Apache 2.4 has changed the syntax of the configuration file. Ensure that =mod_access_compat= is enabled for backwards compatibility when using Apache 2.4, or use the Foswiki:Support.ApacheConfigGenerator config generator.
* %X% *New with Foswiki 2.0* The =configure= script no longer needs any special protection within the Apache configuration.</div>

#ConfigureFoswiki
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.0_001');
$RELEASE = 'Foswiki-2.1.1-RC1';
use version 0.77; $VERSION = version->declare('v2.1.0_002');
$RELEASE = 'Foswiki-2.1.1-RC2';

# Default handlers for different %TAGS%
# Where an entry is set as 'undef', the tag will be demand-loaded
Expand Down

0 comments on commit a3def4d

Please sign in to comment.