summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-01-10 10:22:03 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-01-10 10:22:03 +0000
commit1efb25a4334e8f5378e70949652288ef4c6acbb3 (patch)
treef6b2a2d019ddcaffc3000eacfaf910f41b883261
parenteaaa471d6af4697bb63ab6b4d6db7ed517d44298 (diff)
downloadredmine-1efb25a4334e8f5378e70949652288ef4c6acbb3.tar.gz
redmine-1efb25a4334e8f5378e70949652288ef4c6acbb3.zip
Merged r3298 to r3302 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3303 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/layouts/base.rhtml2
-rw-r--r--doc/CHANGELOG7
-rw-r--r--extra/svn/Redmine.pm5
-rw-r--r--public/stylesheets/application.css2
4 files changed, 15 insertions, 1 deletions
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 7c30482f1..f01ee8e1f 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -62,7 +62,7 @@
<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
<div id="footer">
- Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2009 Jean-Philippe Lang
+ Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2010 Jean-Philippe Lang
</div>
</div>
<%= call_hook :view_layouts_base_body_bottom %>
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 7b7c6f090..0a439b806 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -4,6 +4,13 @@ Redmine - project management software
Copyright (C) 2006-2010 Jean-Philippe Lang
http://www.redmine.org/
+== 0.9.1
+
+* Vertical alignment for inline images in formatted text set to 'middle'
+* Fixed: Redmine.pm error "closing dbh with active statement handles at /usr/lib/perl5/Apache/Redmine.pm"
+* Fixed: copyright year in footer set to 2010
+
+
== 2010-01-09 v0.9.0 (Release candidate)
* Unlimited subproject nesting
diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index 1829d2b0b..1b3b0910f 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -244,7 +244,9 @@ sub is_public_project {
}
}
$sth->finish();
+ undef $sth;
$dbh->disconnect();
+ undef $dbh;
$ret;
}
@@ -310,10 +312,13 @@ sub is_member {
$ret = 1 if ($ldap->authenticate($redmine_user, $redmine_pass));
}
$sthldap->finish();
+ undef $sthldap;
}
}
$sth->finish();
+ undef $sth;
$dbh->disconnect();
+ undef $dbh;
if ($cfg->{RedmineCacheCredsMax} and $ret) {
if (defined $usrprojpass) {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3b951486f..b8fe94678 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -674,6 +674,8 @@ a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
+div.wiki img { vertical-align: middle; }
+
/***** My page layout *****/
.block-receiver {
border:1px dashed #c0c0c0;