Browse files

Merge branch '0.98'

  • Loading branch information...
2 parents 85e2ccd + 54b5726 commit f8b5ad1cadd1370420f5477c47545386865baf94 @cweiske committed Mar 21, 2013
Showing with 28 additions and 21 deletions.
  1. +16 −19 build.xml
  2. +1 −1 data/templates/default/about.tpl.php
  3. +10 −0 doc/ChangeLog
  4. +1 −1 doc/README.rst
View
35 build.xml
@@ -10,27 +10,15 @@
<property file="html.properties" />
<property name="version-m" value="0.98" />
- <property name="version" value="0.98.4" />
+ <property name="version" value="0.98.5" />
<property name="stability" value="beta" />
<property name="releasenotes" value="
-- Fix bug #3439729: URLs were escaped too often in bookmark list
-- Fix bug: Subtitle was not escaped
-- Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions
-- Fix bug #3393951: Logo images missing on bookmark page
-- Fix bug #3399815: PHP error in opensearch API in 0.98.3
-- Fix bug #3407728: Can't delete users from admin page
-- Fix bug #3431742: open_basedir problems with /etc/ config files
-- Fix bug #3436624: Wrong URL for Delicious API when importing
-- Fix bug #3463481: RSS feed show warnings in feedvalidator.org
-- Fix bug #3384416: Use URL with protocol in bookmarklet
-- Fix bug: Invalid HTML when website thumbnails are activated
-- Fix bug #3413459: Thumbnails not in one line
-- Fix bug #3468293: Delicious import does not preserve private links
-- Fix bug #3396727: Title of http://lesscss.org/ not loaded
-- Fix bug #3111254: getIdFromUser() always returns an integer now (part 2)
-- Implement request #3403609: fr_CA translation update
-- Implement patch #3476011: PostgreSQL tables can not be initialized
- (Frédéric Fauberteau [triaxx])
+- Fix bug #109: preserve privacy setting from Delicious export files
+ (Thanks to David Glenck)
+- Fix bug #110: Document solution for &quot;searching slashes&quot;
+- Fix bug #111: Comments in config.php mention *.inc.php files
+ (José María Mateos [rinze])
+- Fix bug: Do not use eregi functions anymore
" />
<property name="zipfile" value="${phing.project.name}-${version}.zip" />
<property name="pkgfile" value="${phing.project.name}-${version}.tgz" />
@@ -173,6 +161,15 @@
type="pear-config" from="@data_dir@" to="data_dir"
/>
+ <changelog version="0.98.5" date="2013-03-20" license="GPL">
+- Fix bug #109: preserve privacy setting from Delicious export files
+ (Thanks to David Glenck)
+- Fix bug #110: Document solution for "searching slashes"
+- Fix bug #111: Comments in config.php mention *.inc.php files
+ (José María Mateos [rinze])
+- Fix bug: Do not use eregi functions anymore
+ </changelog>
+
<changelog version="0.98.4" date="2012-01-21" license="GPL">
- Fix bug #3439729: URLs were escaped too often in bookmark list
- Fix bug: Subtitle was not escaped
View
2 data/templates/default/about.tpl.php
@@ -17,7 +17,7 @@
<?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?>
-<li>SemanticScuttle v0.98.4</li>
+<li>SemanticScuttle v0.98.5</li>
<?php endif ?>
</ul>
View
10 doc/ChangeLog
@@ -3,6 +3,16 @@ ChangeLog for SemantiScuttle
.. contents::
+0.98.5 - 2013-03-20
+-------------------
+- Fix bug #109: preserve privacy setting from Delicious export files
+ (Thanks to David Glenck)
+- Fix bug #110: Document solution for "searching slashes"
+- Fix bug #111: Comments in config.php mention \*.inc.php files
+ (José María Mateos [rinze])
+- Fix bug: Do not use eregi functions anymore
+
+
0.98.4 - 2012-01-21
-------------------
- Fix bug #3439729: URLs were escaped too often in bookmark list
View
2 doc/README.rst
@@ -1,5 +1,5 @@
======================
-SemanticScuttle 0.98.4
+SemanticScuttle 0.98.5
======================
A social bookmarking tool experimenting with new features
like structured tags or collaborative descriptions of tags.

0 comments on commit f8b5ad1

Please sign in to comment.