Merge branch '0.98'

4 files changed, 42 insertions, 27 deletions

diff --git a/build.xml b/build.xml
index 6bd5eb2..ebbf6da 100644
--- a/build.xml
+++ b/build.xml
@@ -10,30 +10,13 @@
   <property file="html.properties" />
 
   <property name="version-m"  value="0.98" />
-  <property name="version"    value="0.98.0" />
+  <property name="version"    value="0.98.1" />
   <property name="stability"  value="beta" />
-  <property name="releasenotes" value="- Switch to jQuery and drop dojo
-- Implement request #2928950: Private keys for RSS feeds (Mark Pemberton)
-- Implement request #3164348: Configurable default privacy (Brett Dee)
-- Implement request #1989987: Theming support
-- Implement request #3054906: Show user's full name instead of nickname
-- Implement patch #3059829: update ``FR_CA`` translation
-- Fix bug #3187177: Wrong URL / Export XML Bookmarks
-- Fix bug #3097187: Using opensearch with two tags does not work in Firefox
-- Fix bug #3251877: French translation JavaScript Bug when editing bookmarks
-- Fix bug #3168521: Title of tag-filtered RSS Feed is broken
-- Fix bug #2853627: Javascript warning
-- Fix bug in ``getTagsForBookmarks()`` that fetched all tags
-- Fix privacy issue when fetching tags of several users
-- Fix Google custom search XML
-- Show error message on mysqli connection errors
-- Update php-gettext library to 1.0.10
-- ``api/posts/add`` respects the 'replace' parameter now
-- Only URLs with an allowed protocol may be added to the database
-- Support HTTPS connections when ``$root`` is not configured
-- SQL schema version table to ease future database upgrades
-- Documentation is written with rST (reStructuredText) now
-- Support per-host configuration files
+  <property name="releasenotes" value="
+- Fix bug #3375635: XML parsing problem in top.inc.php
+- Fix bug #3375428: Forgot to remove some old dojo files
+- Fix bug #3160512: Make SemanticScuttle work with FastCGI
+- Fix bug #3376618: Broken tag completion for private bookmarks
 " />
   <property name="zipfile"     value="${phing.project.name}-${version}.zip" />
   <property name="pkgfile"     value="${phing.project.name}-${version}.tgz" />
@@ -153,7 +136,39 @@
       type="pear-config" from="@data_dir@" to="data_dir"
       />
 
-     <changelog version="0.97" date="2010-06-09" license="GPL">
+     <changelog version="0.98.1" date="2011-08-01" license="GPL">
+- Fix bug #3375635: XML parsing problem in top.inc.php
+- Fix bug #3375428: Forgot to remove some old dojo files
+- Fix bug #3160512: Make SemanticScuttle work with FastCGI
+- Fix bug #3376618: Broken tag completion for private bookmarks
+     </changelog>
+
+     <changelog version="0.98.0" date="2011-07-21" license="GPL">
+- Switch to jQuery and drop dojo
+- Implement request #2928950: Private keys for RSS feeds (Mark Pemberton)
+- Implement request #3164348: Configurable default privacy (Brett Dee)
+- Implement request #1989987: Theming support
+- Implement request #3054906: Show user's full name instead of nickname
+- Implement patch #3059829: update ``FR_CA`` translation
+- Fix bug #3187177: Wrong URL / Export XML Bookmarks
+- Fix bug #3097187: Using opensearch with two tags does not work in Firefox
+- Fix bug #3251877: French translation JavaScript Bug when editing bookmarks
+- Fix bug #3168521: Title of tag-filtered RSS Feed is broken
+- Fix bug #2853627: Javascript warning
+- Fix bug in ``getTagsForBookmarks()`` that fetched all tags
+- Fix privacy issue when fetching tags of several users
+- Fix Google custom search XML
+- Show error message on mysqli connection errors
+- Update php-gettext library to 1.0.10
+- ``api/posts/add`` respects the 'replace' parameter now
+- Only URLs with an allowed protocol may be added to the database
+- Support HTTPS connections when ``$root`` is not configured
+- SQL schema version table to ease future database upgrades
+- Documentation is written with rST (reStructuredText) now
+- Support per-host configuration files
+     </changelog>
+
+     <changelog version="0.97.0" date="2010-06-09" license="GPL">
 - Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now
 - New config option to skip "SET NAMES UTF8" call: $dbneedssetnames
 - Do not highlight admin bookmarks when $enableAdminColors is disabled
diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php
index 8a9b206..f53d1ca 100644
--- a/data/templates/default/about.tpl.php
+++ b/data/templates/default/about.tpl.php
@@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 
 <?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?>
-<li>SemanticScuttle v0.98.0</li>
+<li>SemanticScuttle v0.98.1</li>
 <?php endif ?>
 </ul>
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 53450cd..8fc6743 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,7 +3,7 @@ ChangeLog for SemantiScuttle
 
 .. contents::
 
-0.98.1 - 2011-XX-XX
+0.98.1 - 2011-08-01
 -------------------
 - Fix bug #3375635: XML parsing problem in top.inc.php
 - Fix bug #3375428: Forgot to remove some old dojo files
diff --git a/doc/developers/release-new-version.rst b/doc/developers/release-new-version.rst
index a5e77dc..74f4bbd 100644
--- a/doc/developers/release-new-version.rst
+++ b/doc/developers/release-new-version.rst
@@ -4,7 +4,7 @@ How to release a new version of SemanticScuttle
 0. Run unit tests and verify that all of them pass
 1. Update ``doc/ChangeLog``
 2. Update ``doc/UPGRADE.txt``
-3. Update version in ``data/templates/about.tpl.php``,
+3. Update version in ``data/templates/default/about.tpl.php``,
    ``build.xml`` and ``doc/README.rst``
 4. Create a release zip file via the build script:
    Just type "``phing``".