Author: bob
Date: 2012-05-07 12:45:33 +0100 (Mon, 07 May 2012)
New Revision: 1395
Modified:
trunk/
trunk/Changes
trunk/lib/OpenGuides/CGI.pm
trunk/lib/OpenGuides/Config.pm
trunk/lib/OpenGuides/JSON.pm
trunk/lib/OpenGuides/Template.pm
trunk/lib/OpenGuides/Utils.pm
Log:
merge changes from release branch
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/rel_0_66:1319-1327
+ /branches/rel_0_66:1319-1327
/branches/rel_0_67:1391-1394
Modified: trunk/Changes
===================================================================
--- trunk/Changes 2012-05-07 10:22:50 UTC (rev 1394)
+++ trunk/Changes 2012-05-07 11:45:33 UTC (rev 1395)
@@ -3,7 +3,7 @@
More detailed changelogs can be found at
<http://dev.openguides.org/log/trunk>.
-0.67 ?
+0.67 07 May 2012
Switched from the Google Maps API to the Leaflet mapping library.
To make this work, set use_leaflet = 1 in your wiki.conf, and ensure
that div#map_index_canvas is given a non-zero height in your
Modified: trunk/lib/OpenGuides/CGI.pm
===================================================================
--- trunk/lib/OpenGuides/CGI.pm 2012-05-07 10:22:50 UTC (rev 1394)
+++ trunk/lib/OpenGuides/CGI.pm 2012-05-07 11:45:33 UTC (rev 1395)
@@ -1,7 +1,7 @@
package OpenGuides::CGI;
use strict;
use vars qw( $VERSION );
-$VERSION = '0.10';
+$VERSION = '0.11';
use Carp qw( croak );
use CGI;
Modified: trunk/lib/OpenGuides/Config.pm
===================================================================
--- trunk/lib/OpenGuides/Config.pm 2012-05-07 10:22:50 UTC (rev 1394)
+++ trunk/lib/OpenGuides/Config.pm 2012-05-07 11:45:33 UTC (rev 1395)
@@ -3,7 +3,7 @@
use warnings;
use vars qw( $VERSION );
-$VERSION = '0.06';
+$VERSION = '0.07';
use Carp qw( croak );
use Config::Tiny;
Modified: trunk/lib/OpenGuides/JSON.pm
===================================================================
--- trunk/lib/OpenGuides/JSON.pm 2012-05-07 10:22:50 UTC (rev 1394)
+++ trunk/lib/OpenGuides/JSON.pm 2012-05-07 11:45:33 UTC (rev 1395)
@@ -3,7 +3,7 @@
use strict;
use vars qw( $VERSION );
-$VERSION = '0.02';
+$VERSION = '0.03';
use Wiki::Toolkit::Plugin::JSON;
use Time::Piece;
@@ -312,7 +312,7 @@
=head1 COPYRIGHT
-Copyright (C) 2003-2009 The OpenGuides Project. All Rights Reserved.
+Copyright (C) 2003-2012 The OpenGuides Project. All Rights Reserved.
This module is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/lib/OpenGuides/Template.pm
===================================================================
--- trunk/lib/OpenGuides/Template.pm 2012-05-07 10:22:50 UTC (rev 1394)
+++ trunk/lib/OpenGuides/Template.pm 2012-05-07 11:45:33 UTC (rev 1395)
@@ -2,7 +2,7 @@
use strict;
use vars qw( $VERSION );
-$VERSION = '0.16';
+$VERSION = '0.17';
use Carp qw( croak );
use CGI; # want to get rid of this and put the burden on the templates
Modified: trunk/lib/OpenGuides/Utils.pm
===================================================================
--- trunk/lib/OpenGuides/Utils.pm 2012-05-07 10:22:50 UTC (rev 1394)
+++ trunk/lib/OpenGuides/Utils.pm 2012-05-07 11:45:33 UTC (rev 1395)
@@ -2,7 +2,7 @@
use strict;
use vars qw( $VERSION );
-$VERSION = '0.12';
+$VERSION = '0.13';
use Carp qw( croak );
use Wiki::Toolkit;
@@ -545,7 +545,7 @@
=head1 COPYRIGHT
- Copyright (C) 2003-2008 The OpenGuides Project. All Rights Reserved.
+ Copyright (C) 2003-2012 The OpenGuides Project. All Rights Reserved.
This module is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Show replies by date