prepare release 0.6.0

diff --git a/ChangeLog b/ChangeLog
index 0129a190d0a229223b97f9445f01df22ea69b8a5..f40c0f5ccb5d6071b336b7fb1c6e25a937527e78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-09-18  Christian Weiske  <cweiske@cweiske.de>
+
+       * Fix search in ownCloud 8.1
+       * Fix #22 and #24: Escape slashes in tags in URLs
+       * Fix #28: array_shift() E_NOTICE in owncloud.log
+       * Move note filtering onto the SQL server
+       * Register app menu icon more efficiently
+       * Add SVG icon
+
 2015-06-04  Christian Weiske  <cweiske@cweiske.de>
 
        * Fix #19: Tabs ignored in HTML export

diff --git a/README.rst b/README.rst
index 2b7bd62a903ab1e14ab29e52c6f084495290b95e..5b5d65ab99a592e7a3c214c2f2bece8168f6e346 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -91,6 +91,15 @@ __ http://pecl.php.net/package/oauth
 Installation
 ============
 
+App store installation
+======================
+Installation via the app store does not work currently, see
+https://github.com/cweiske/grauphel/issues/26
+
+If one day it works, you can use the ownCloud "Apps" app, select
+"Productivity" and install grauphel with a single click.
+
+
 Manual installation
 ===================
 
@@ -99,9 +108,9 @@ Manual installation
 #. Download the latest release from http://cweiske.de/grauphel.htm and extract it.
    For example::
 
-     $ wget http://cweiske.de/download/grauphel/grauphel-0.5.1.tar.bz2
-     $ tar xjvf grauphel-0.5.1.tar.bz2
-     $ rm grauphel-0.5.1.tar.bz2
+     $ wget http://cweiske.de/download/grauphel/grauphel-0.6.0.tar.bz2
+     $ tar xjvf grauphel-0.6.0.tar.bz2
+     $ rm grauphel-0.6.0.tar.bz2
 
    You do have a directory ``/var/www/owncloud/apps/grauphel`` now.
 #. Using your browser, login as administrator into ownCloud and click

diff --git a/appinfo/info.xml b/appinfo/info.xml
index b6a73b17f70200c1937169e43601e6c9c8c2845d..95b483ced10d44779c8f23ca619cf6a5d31d19b3 100755 (executable)
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -7,7 +7,7 @@
 
   Tomboy, Conboy and Tomdroid clients are supported.
  </description>
- <version>0.5.1</version>
+ <version>0.6.0</version>
  <licence>AGPL3 or later</licence>
  <author>Christian Weiske</author>
 

diff --git a/appinfo/version b/appinfo/version
index 4b9fcbec101a6ff8ec68e0f95131ccda4861407f..a918a2aa18d5bec6a8bb93891a7a63c243111796 100755 (executable)
--- a/appinfo/version
+++ b/appinfo/version
@@ -1 +1 @@
-0.5.1
+0.6.0

diff --git a/build.xml b/build.xml
index 0db8a62c50aaf1504bab4dfdd9eb2fe5aadf302d..32e6a81b9519d7478ceec6900564a9294cbac283 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,7 @@
    <include name="**"/>
    <exclude name="dist/"/>
    <exclude name=".git"/>
+   <exclude name=".travis.yml"/>
    <exclude name="**/.gitignore"/>
    <exclude name="**/build.xml"/>
    <exclude name="**/README.html"/>