summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2011-08-09 08:17:35 +0200
committerChristian Weiske <cweiske@cweiske.de>2011-08-09 08:17:35 +0200
commitefe5988df3eb4b4603c5e3b81d12819c3f667a5f (patch)
tree23d31c8ff1999c57e3d794cc2445ccba853d64ea
parent062fe09d43b25db5f4790c5ac33ab7e2e9f3b68e (diff)
parent057bc0b9320e1118940f61239fc21a5598beb124 (diff)
downloadsemanticscuttle-efe5988df3eb4b4603c5e3b81d12819c3f667a5f.tar.gz
semanticscuttle-efe5988df3eb4b4603c5e3b81d12819c3f667a5f.tar.bz2
Merge branch '0.98'
Conflicts: build.xml
-rw-r--r--build.xml13
-rw-r--r--data/templates/default/about.tpl.php2
-rw-r--r--doc/ChangeLog8
-rw-r--r--doc/README.rst2
-rw-r--r--doc/UPGRADE.txt2
5 files changed, 18 insertions, 9 deletions
diff --git a/build.xml b/build.xml
index d7735c8..f50499b 100644
--- a/build.xml
+++ b/build.xml
@@ -10,14 +10,13 @@
<property file="html.properties" />
<property name="version-m" value="0.98" />
- <property name="version" value="0.98.2" />
+ <property name="version" value="0.98.3" />
<property name="stability" value="beta" />
<property name="releasenotes" value="
-- Fix bug #3385724: Rename tag ends with XML Parsing Error
-- Fix bug #3386178: 'system:unfiled' secret tag does not work
-- Fix bug #3384416: Update documentation to explain HTTP/HTTPS root problem
-- Fix bug #3382126: Linked tags does not work for tags with spaces
-- Fix delicious API help page link
+- Fix bug #3388456: Missing scripts/fix-unfiled-tags.php
+
+The script was only missing in the .zip file; the PEAR package
+contained it - thus no 0.98.3 PEAR package.
" />
<property name="zipfile" value="${phing.project.name}-${version}.zip" />
<property name="pkgfile" value="${phing.project.name}-${version}.tgz" />
@@ -32,6 +31,8 @@
<include name="doc/**"/>
<include name="src/**"/>
<include name="www/**"/>
+ <include name="scripts/avahi-export.php"/>
+ <include name="scripts/fix-unfiled-tags.php"/>
<exclude name="**/.gitignore/"/>
<exclude name="**/.svn/"/>
<exclude name="data/config.php"/>
diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php
index a9dae5c..bd9348c 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.2</li>
+<li>SemanticScuttle v0.98.3</li>
<?php endif ?>
</ul>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 81c2f6d..942c65c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,14 @@ ChangeLog for SemantiScuttle
.. contents::
+0.98.3 - 2011-08-09
+-------------------
+- Fix bug #3388456: Missing scripts/fix-unfiled-tags.php
+
+The script was only missing in the .zip file; the PEAR package
+contained it - thus no 0.98.3 PEAR package.
+
+
0.98.2 - 2011-08-08
-------------------
- Fix bug #3385724: Rename tag ends with XML Parsing Error
diff --git a/doc/README.rst b/doc/README.rst
index 225f021..a8ef83e 100644
--- a/doc/README.rst
+++ b/doc/README.rst
@@ -1,5 +1,5 @@
======================
-SemanticScuttle 0.98.2
+SemanticScuttle 0.98.3
======================
A social bookmarking tool experimenting with new features
like structured tags or collaborative descriptions of tags.
diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt
index e405431..511748e 100644
--- a/doc/UPGRADE.txt
+++ b/doc/UPGRADE.txt
@@ -4,7 +4,7 @@ Upgrading SemanticScuttle from a previous version
.. contents::
-From version 0.94-0.98.1 to 0.98.2
+From version 0.94-0.98.1 to 0.98.3
==================================
Run ``scripts/fix-unfiled-tags.php`` to fix old bookmarks that miss the
``system:unfiled`` tags.