diff --git a/trean/docs/CHANGES b/trean/docs/CHANGES index 9cc54126914..09742dd34a4 100644 --- a/trean/docs/CHANGES +++ b/trean/docs/CHANGES @@ -2,6 +2,7 @@ v1.2.0-git ---------- +[mjr] Fix missing CSS rules for blocks. [mjr] Add new block for displaying bookmarks tagged with a certain set of tags (Request #13020). diff --git a/trean/package.xml b/trean/package.xml index 39c469ab747..1bf7214e620 100644 --- a/trean/package.xml +++ b/trean/package.xml @@ -22,7 +22,7 @@ jan@horde.org yes - 2014-07-06 + 2014-12-10 1.1.0RC2 1.1.0 @@ -33,6 +33,7 @@ BSD-2-Clause +* [mjr] Fix missing CSS rules for blocks. * [mjr] Add new block for displaying bookmarks tagged with a certain set of tags (Request #13020). @@ -236,6 +237,9 @@ + + + @@ -539,6 +543,7 @@ + diff --git a/trean/templates/block/standard.inc b/trean/templates/block/standard.inc index 4e679abf3b3..cb307f91f34 100644 --- a/trean/templates/block/standard.inc +++ b/trean/templates/block/standard.inc @@ -17,7 +17,7 @@ if ($bookmark->http_status == 'error') { -
+
title) ?> (clicks . ' ' . ($bookmark->clicks == 1 ? _("click") : _("clicks")) ?>)