From a67a7f761d7f0b4567ba8e9903fbcae075df4c73 Mon Sep 17 00:00:00 2001
From: José María Mateos
Date: Sun, 17 Mar 2013 17:16:57 +0100
Subject: Changed commit comment information
---
data/config.php.dist | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'data')
diff --git a/data/config.php.dist b/data/config.php.dist
index 302d55f..5f49857 100644
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -2,9 +2,9 @@
/**
* Configuration for SemanticScuttle.
*
- * Copy this file to config.inc.php and adjust it.
+ * Copy this file to config.php and adjust it.
*
- * See config.default.inc.php for more options.
+ * See config.default.php for more options.
*/
--
cgit v1.2.3-54-g00ecf
From 54b5726157c262df3d79e0f92bfacc6d13dfb47b Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Wed, 20 Mar 2013 18:06:15 +0100
Subject: prepare release of 0.98.5
---
build.xml | 35 ++++++++++++++++-------------------
data/templates/default/about.tpl.php | 2 +-
doc/ChangeLog | 10 ++++++++++
doc/README.rst | 2 +-
4 files changed, 28 insertions(+), 21 deletions(-)
(limited to 'data')
diff --git a/build.xml b/build.xml
index 431fdbf..828515f 100644
--- a/build.xml
+++ b/build.xml
@@ -10,27 +10,15 @@
-
+
@@ -152,6 +140,15 @@
type="pear-config" from="@data_dir@" to="data_dir"
/>
+
+- 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
+
+
- Fix bug #3439729: URLs were escaped too often in bookmark list
- Fix bug: Subtitle was not escaped
diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php
index d850783..843a31f 100644
--- a/data/templates/default/about.tpl.php
+++ b/data/templates/default/about.tpl.php
@@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']);
isAdmin()): ?>
-SemanticScuttle v0.98.4
+SemanticScuttle v0.98.5
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1711127..ff60527 100644
--- a/doc/ChangeLog
+++ b/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
diff --git a/doc/README.rst b/doc/README.rst
index caf6b75..ed41a38 100644
--- a/doc/README.rst
+++ b/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.
--
cgit v1.2.3-54-g00ecf