Author: bob Date: 2012-08-26 12:06:46 +0100 (Sun, 26 Aug 2012) New Revision: 1441

Modified: trunk/ trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Utils.pm trunk/wiki.cgi Log: merge of release changes for 0.70

Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/rel_0_66:1319-1327 /branches/rel_0_67:1391-1394 /branches/rel_0_68:1406-1409 /branches/rel_0_69:1423-1426 + /branches/rel_0_66:1319-1327 /branches/rel_0_67:1391-1394 /branches/rel_0_68:1406-1409 /branches/rel_0_69:1423-1426 /branches/rel_0_70:1437-1440

Modified: trunk/Changes =================================================================== --- trunk/Changes 2012-08-26 10:57:25 UTC (rev 1440) +++ trunk/Changes 2012-08-26 11:06:46 UTC (rev 1441) @@ -3,10 +3,11 @@ More detailed changelogs can be found at http://dev.openguides.org/log/trunk.

-0.70 ? +0.70 26 August 2012 New elements allowed in page content: span, dl, dt, dd (fixes #303). Changed external link formatting; they're now given a class of "external" and the previous hardcoded square brackets are no more. + This requires version 0.24 of Wiki::Toolkit::Formatter::UseMod. If you want the old behaviour back, put this in your CSS (with "black" replaced by whatever colour you have your body text in): a.external:before {

Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2012-08-26 10:57:25 UTC (rev 1440) +++ trunk/lib/OpenGuides/Utils.pm 2012-08-26 11:06:46 UTC (rev 1441) @@ -2,7 +2,7 @@

use strict; use vars qw( $VERSION ); -$VERSION = '0.14'; +$VERSION = '0.15';

use Carp qw( croak ); use Wiki::Toolkit;

Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2012-08-26 10:57:25 UTC (rev 1440) +++ trunk/lib/OpenGuides.pm 2012-08-26 11:06:46 UTC (rev 1441) @@ -14,7 +14,7 @@

use vars qw( $VERSION );

-$VERSION = '0.69'; +$VERSION = '0.70';

=head1 NAME

Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2012-08-26 10:57:25 UTC (rev 1440) +++ trunk/wiki.cgi 2012-08-26 11:06:46 UTC (rev 1441) @@ -4,7 +4,7 @@ use warnings; use sigtrap die => 'normal-signals'; use vars qw( $VERSION ); -$VERSION = '0.69'; +$VERSION = '0.70';

use CGI qw/:standard/; use CGI::Carp qw(croak);