From c13e28573a7ec204809fb42bab55eb56cdf77332 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 4 Jun 2015 18:06:22 +0200 Subject: [PATCH 01/16] release instructions --- README.rst | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 6afa808..76b6c0b 100644 --- a/README.rst +++ b/README.rst @@ -3,13 +3,15 @@ grauphel - tomboy REST server ***************************** ownCloud__ application implementing the `Tomboy`__ `REST API`__ for syncing notes. -Work in progress. +Pretty stable. __ http://owncloud.org/ __ https://wiki.gnome.org/Apps/Tomboy __ https://wiki.gnome.org/Apps/Tomboy/Synchronization/REST/1.0 +.. contents:: + ====== Status ====== @@ -49,6 +51,10 @@ grauphel 0.2.1 is known to work with: * Tomboy 1.15.1, Windows * Tomdroid 0.7.5, Android 4.4.1 +See the HowTo__ document for client-specific configuration instructions. + +__ docs/howto.rst + ============= Functionality @@ -147,3 +153,22 @@ Development hints output. * ``latest-sync-revision`` sent from Tomboy during PUT sync is already incremented by 1. + + +Releasing grauphel +================== +To release a new version, do the following: + +#. Increase version number in ``appinfo/version`` and ``appinfo/info.xml``. +#. Fill the ``ChangeLog`` file with the changes since the last release, + mention the new version number. +#. Update ``README.rst`` and increase the version number +#. Create the grauphel release file with:: + + $ phing + + The file will be in ``dist/`` +#. Test the release on a server +#. Tag the release in git +#. Upload the release to http://cweiske.de/grauphel.htm +#. Link the new release on https://apps.owncloud.com/content/show.php?content=166654 -- 2.30.2 From 89a7da2db6368707c1247b25b7605a4cb1db83d0 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 4 Jun 2015 18:07:27 +0200 Subject: [PATCH 02/16] prepare release of 0.5.1 --- ChangeLog | 5 +++++ README.rst | 6 +++--- appinfo/info.xml | 2 +- appinfo/version | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e7f13e..0129a19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-06-04 Christian Weiske + + * Fix #19: Tabs ignored in HTML export + * Version 0.5.1 + 2015-03-17 Christian Weiske * Implement standalone HTML mode for notes diff --git a/README.rst b/README.rst index 76b6c0b..22aa44a 100644 --- a/README.rst +++ b/README.rst @@ -99,9 +99,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.0.tar.bz2 - $ tar xjvf grauphel-0.5.0.tar.bz2 - $ rm grauphel-0.5.0.tar.bz2 + $ 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 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 9b797b9..3f2c2c4 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -3,7 +3,7 @@ grauphel Grauphel: Tomboy note server Tomboy REST API server to sync notes between devices - 0.5.0 + 0.5.1 AGPL3 or later Christian Weiske 7 diff --git a/appinfo/version b/appinfo/version index 8f0916f..4b9fcbe 100755 --- a/appinfo/version +++ b/appinfo/version @@ -1 +1 @@ -0.5.0 +0.5.1 -- 2.30.2 From 592c24c61edb8e50a5056f5ac265052b5c99d81b Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 15 Jul 2015 19:27:11 +0200 Subject: [PATCH 03/16] - Expand app information section. - Register app menu item more efficiently[1] - Add SVG app icon to make it show up in the app management page [1] https://owncloud.org/blog/owncloud-8-1-brings-massively-improved-api-for-developers/ --- appinfo/app.php | 6 ++---- appinfo/info.xml | 33 ++++++++++++++++++++++++++------- img/app.svg | 3 +++ img/tomboy-grey.png | Bin 864 -> 0 bytes 4 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 img/app.svg delete mode 100644 img/tomboy-grey.png diff --git a/appinfo/app.php b/appinfo/app.php index 704b2c7..d78a9bb 100755 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -1,12 +1,10 @@ getNavigationManager()->add( array( 'id' => 'grauphel', 'order' => 2342, 'href' => \OCP\Util::linkToRoute('grauphel.gui.index'), - 'icon' => OCP\Util::imagePath('grauphel', 'tomboy-grey.png'), + 'icon' => \OCP\Util::imagePath('grauphel', 'app.svg'), 'name' => 'Tomboy notes' ) ); diff --git a/appinfo/info.xml b/appinfo/info.xml index 3f2c2c4..41cf119 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -1,10 +1,29 @@ - grauphel - Grauphel: Tomboy note server - Tomboy REST API server to sync notes between devices - 0.5.1 - AGPL3 or later - Christian Weiske - 7 + grauphel + Grauphel: Tomboy note server + + Tomboy REST API server to sync notes between devices. + + Tomboy, Conboy and Tomdroid clients are supported. + + 0.5.1 + AGPL3 or later + Christian Weiske + + 7 + Grauphel + + OAuth + + + + http://www.bogo/grauphel.htm#installation + + http://cweiske.de/grauphel.htm + FIXME http://git.cweiske.de/grauphel.git + https://github.com/cweiske/grauphel/issues + + productivity + 166654 diff --git a/img/app.svg b/img/app.svg new file mode 100644 index 0000000..ab87655 --- /dev/null +++ b/img/app.svg @@ -0,0 +1,3 @@ + + +image/svg+xmlJakub Steinerhttp://jimmac.musichall.cz diff --git a/img/tomboy-grey.png b/img/tomboy-grey.png deleted file mode 100644 index 069a7576d445a5d3ea896d2304c7e6c5b0e5be38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 864 zcmV-m1E2hfP)kdg00002VoOIv0RM-N z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-U=KM7zV-v(^3Ec0`W;iK~zY` zrIlMq6j2<;f9K51-qhW7%}fa+DlL4=ZlIA#c7aN|P?i)yU=Kk>K?Xrj1wHxFQw#Rc zTToFi^ha?0HeQD(HDHWKcVwo>OOEUR@r(cQ~A) zg%6ly#nZF1W>CE~`@xRT1SX3ZLyV1GaK&KbvCzf6em~ue5+`ezP50YpZDON*eyQlt z&Vb1`;=I&{J147KzD#{}Fu2lctovP(P8(%xWRzZFv=dfq3$@}u05q5Ts#XhOQ%a8# zG_jb~3^2%N-m;$kj0Dc`}PVA?=btCyB-a*}vA3 z&@evIy95RKmwPHmDq*q+p{$zD!8|Vk*XMy5ZVH}^tAN)eNz5fcE=+c*pdu)Q0Qs1% z0Q{KZd5}RBgzDGl=5I2A0lxq`d(T-+_OxIC0000 Date: Wed, 15 Jul 2015 20:23:11 +0200 Subject: [PATCH 04/16] make search work in ownCloud 8.1 --- appinfo/app.php | 6 +++++- grauphel.css | 8 +++++++- templates/error.php | 1 + templates/gui-database.php | 1 + templates/gui-note.php | 1 + templates/index.php | 1 + templates/tag.php | 1 + templates/tokens.php | 1 + 8 files changed, 18 insertions(+), 2 deletions(-) diff --git a/appinfo/app.php b/appinfo/app.php index d78a9bb..afbc787 100755 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -8,6 +8,10 @@ 'name' => 'Tomboy notes' ) ); -\OC_Search::registerProvider('OCA\Grauphel\Search\Provider'); + +\OC::$server->getSearch()->registerProvider( + 'OCA\Grauphel\Search\Provider', array('apps' => array('grauphel')) +); + \OCP\Util::addscript('grauphel', 'loader'); ?> diff --git a/grauphel.css b/grauphel.css index 14eafb0..20c0ead 100644 --- a/grauphel.css +++ b/grauphel.css @@ -132,7 +132,7 @@ table.table thead th { vertical-align: middle; } -table.table th, table.table td { +table.table th, table.table td, #searchresults td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; @@ -194,4 +194,10 @@ table.table form button.action { } .note-content a { text-decoration: underline; +} + +#searchresults { + margin-top: 0px; + min-height: 100%; + margin-bottom: 50px; } \ No newline at end of file diff --git a/templates/error.php b/templates/error.php index 7ce4f8d..9ea4c33 100644 --- a/templates/error.php +++ b/templates/error.php @@ -1,6 +1,7 @@
+

grauphel - Tomboy notes server

Error

diff --git a/templates/gui-database.php b/templates/gui-database.php index 6fc057a..95c70d6 100644 --- a/templates/gui-database.php +++ b/templates/gui-database.php @@ -6,6 +6,7 @@
+

Manage database

In case something went seriously wrong during synchronization, you may reset your diff --git a/templates/gui-note.php b/templates/gui-note.php index ae004d6..8061a50 100644 --- a/templates/gui-note.php +++ b/templates/gui-note.php @@ -6,6 +6,7 @@

+
HTML Text diff --git a/templates/index.php b/templates/index.php index e945f9a..6eb2905 100644 --- a/templates/index.php +++ b/templates/index.php @@ -4,6 +4,7 @@ printPage(); ?>
+

grauphel - Tomboy notes server

diff --git a/templates/tag.php b/templates/tag.php index a8752a4..7d5cab1 100644 --- a/templates/tag.php +++ b/templates/tag.php @@ -4,6 +4,7 @@ printPage(); ?>

+

Notebook:

diff --git a/templates/tokens.php b/templates/tokens.php index 3aaabb7..c79ba7d 100644 --- a/templates/tokens.php +++ b/templates/tokens.php @@ -6,6 +6,7 @@
+

Manage access tokens

Here you see which applications have access to the notes. -- 2.30.2 From ba4f1f02ea2f99eb2be367530f28e0146fa303f7 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 14 Aug 2015 07:47:15 +0200 Subject: [PATCH 05/16] Fix #22 and #24: Escape slashes in tags in URLs References: - https://github.com/cweiske/grauphel/issues/22 - https://github.com/cweiske/grauphel/issues/24 --- controller/guicontroller.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/controller/guicontroller.php b/controller/guicontroller.php index 29dd03f..d48296d 100644 --- a/controller/guicontroller.php +++ b/controller/guicontroller.php @@ -168,6 +168,7 @@ class GuiController extends Controller */ public function tag($rawtag) { + $rawtag = $this->unescapeTagFromUrl($rawtag); $notes = $this->getNotes()->loadNotesOverview(null, $rawtag, true); usort( $notes, @@ -288,7 +289,8 @@ class GuiController extends Controller 'name' => $name, 'id' => $rawtag, 'href' => $this->urlGen->linkToRoute( - 'grauphel.gui.tag', array('rawtag' => $rawtag) + 'grauphel.gui.tag', + array('rawtag' => $this->escapeTagForUrl($rawtag)) ), 'selected' => $rawtag == $selectedRawtag, ); @@ -352,5 +354,15 @@ class GuiController extends Controller } return false; } + + protected function escapeTagForUrl($rawtag) + { + return str_replace('/', '%2F', $rawtag); + } + + protected function unescapeTagFromUrl($rawtag) + { + return str_replace('%2F', '/', $rawtag); + } } ?> -- 2.30.2 From 729cf0b66d9ccaf381a2150f75fb57c1c98c3b4c Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 18 Sep 2015 21:58:58 +0200 Subject: [PATCH 06/16] Add travis-ci.org configuration --- .travis.yml | 10 ++++++++++ README.rst | 12 ++++++++++++ tests/Lib/Converter/HtmlTest.php | 5 +++-- tests/data/formattest.html | 2 +- tests/data/xss.html | 4 ++-- 5 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..cd5a315 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: php +sudo: false +php: + - 7 + - 5.6 + - 5.5 + - 5.4 +script: + - cd tests + - phpunit . diff --git a/README.rst b/README.rst index 22aa44a..2b7bd62 100644 --- a/README.rst +++ b/README.rst @@ -155,6 +155,18 @@ Development hints incremented by 1. +Unit testing +============ +- `ownCloud unit testing documentation`__ +- `grauphel on Travis CI`__ + + .. image:: https://travis-ci.org/cweiske/grauphel.svg + :target: https://travis-ci.org/cweiske/grauphel + +__ https://doc.owncloud.org/server/8.0/developer_manual/core/unit-testing.html +__ https://travis-ci.org/cweiske/grauphel + + Releasing grauphel ================== To release a new version, do the following: diff --git a/tests/Lib/Converter/HtmlTest.php b/tests/Lib/Converter/HtmlTest.php index 0a66ee4..b02e39c 100644 --- a/tests/Lib/Converter/HtmlTest.php +++ b/tests/Lib/Converter/HtmlTest.php @@ -1,4 +1,5 @@ convert($input); $this->assertEquals( file_get_contents(__DIR__ . '/../../data/formattest.html'), @@ -19,7 +20,7 @@ class Lib_Converter_HtmlTest extends PHPUnit_Framework_TestCase { $input = file_get_contents(__DIR__ . '/../../data/xss.tomboynotecontent'); - $converter = new OCA\Grauphel\Lib\Converter\Html(); + $converter = new OCA\Grauphel\Converter\Html(); $output = $converter->convert($input); $this->assertEquals( file_get_contents(__DIR__ . '/../../data/xss.html'), diff --git a/tests/data/formattest.html b/tests/data/formattest.html index 5bc3709..a7dbe14 100644 --- a/tests/data/formattest.html +++ b/tests/data/formattest.html @@ -20,7 +20,7 @@ Formatierungen:
Kursiver Text
Durchgestrichener Text
Hervorgehobener Text
-Feste Breite
+Feste Breite

Schriftgrößen:
klein
diff --git a/tests/data/xss.html b/tests/data/xss.html index 1908ce2..98551bf 100644 --- a/tests/data/xss.html +++ b/tests/data/xss.html @@ -4,8 +4,8 @@ Was ist denn <a href="foo">bar
Link mit fett drin: Formattest.

  • Liste
  • ein bisschen fett
    -
  • monospaced
    +
  • monospaced
  • </li></ul></div></div></div></div></div>

-Link zum Formattest.
+Link zum Formattest.
Link mit Sonder">zeichen.
-- 2.30.2 From 1a5b0cd1539c149d18db4e40f16c56654cace898 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 18 Sep 2015 21:59:35 +0200 Subject: [PATCH 07/16] Fix #28: array_shift() E_NOTICE in owncloud.log --- lib/converter/html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/converter/html.php b/lib/converter/html.php index 29064e5..11cf105 100644 --- a/lib/converter/html.php +++ b/lib/converter/html.php @@ -107,7 +107,7 @@ class Html extends Base } break; case XMLReader::END_ELEMENT: - array_shift($nesting, $reader->name); + array_shift($nesting); if (isset(static::$tagMap[$reader->name])) { $store .= 'name] . '>'; } else if (isset(static::$styleClassMap[$reader->name])) { -- 2.30.2 From b816eb1d59d1f16a8f85d31d6b5ea2826648a332 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 18 Sep 2015 23:14:50 +0200 Subject: [PATCH 08/16] Let the SQL server filter notes --- lib/notestorage.php | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/notestorage.php b/lib/notestorage.php index 93311e4..27bb702 100644 --- a/lib/notestorage.php +++ b/lib/notestorage.php @@ -397,15 +397,18 @@ class NoteStorage public function loadNotesOverview( $since = null, $rawtag = null, $includeDate = false ) { - $result = \OC_DB::executeAudited( - 'SELECT `note_guid`, `note_title`, `note_last_sync_revision`, `note_tags`' + $sql = 'SELECT `note_guid`, `note_title`' + . ', `note_last_sync_revision`, `note_tags`' . ', `note_last_change_date`' . ' FROM `*PREFIX*grauphel_notes`' - . ' WHERE note_user = ?', - array($this->username) - ); + . ' WHERE note_user = ?'; + $sqlData = array($this->username); + + if ($since !== null) { + $sqlData[] = $since; + $sql .= ' AND note_last_sync_revision > ?'; + } - $notes = array(); if ($rawtag == 'grauphel:special:all') { $rawtag = null; } else if ($rawtag == 'grauphel:special:untagged') { @@ -413,13 +416,14 @@ class NoteStorage } else { $jsRawtag = json_encode($rawtag); } + if ($rawtag !== null) { + $sqlData[] = '%' . $jsRawtag . '%'; + $sql .= ' AND note_tags LIKE ?'; + } + + $result = \OC_DB::executeAudited($sql, $sqlData); + $notes = array(); while ($row = $result->fetchRow()) { - if ($since !== null && $row['note_last_sync_revision'] <= $since) { - continue; - } - if ($rawtag !== null && strpos($row['note_tags'], $jsRawtag) === false) { - continue; - } $note = array( 'guid' => $row['note_guid'], 'ref' => array( -- 2.30.2 From 3f70320532c181070ab9ab91af96ce5efad073bf Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 18 Sep 2015 23:18:37 +0200 Subject: [PATCH 09/16] fix git link --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 41cf119..b6a73b1 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -21,7 +21,7 @@ http://www.bogo/grauphel.htm#installation http://cweiske.de/grauphel.htm - FIXME http://git.cweiske.de/grauphel.git + git://git.cweiske.de/grauphel.git https://github.com/cweiske/grauphel/issues productivity -- 2.30.2 From 3401f499d7f806a4402e897e63a0008602f414bb Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 18 Sep 2015 23:39:20 +0200 Subject: [PATCH 10/16] prepare release 0.6.0 --- ChangeLog | 9 +++++++++ README.rst | 15 ++++++++++++--- appinfo/info.xml | 2 +- appinfo/version | 2 +- build.xml | 1 + 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0129a19..f40c0f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-09-18 Christian Weiske + + * 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 * Fix #19: Tabs ignored in HTML export diff --git a/README.rst b/README.rst index 2b7bd62..5b5d65a 100644 --- 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 b6a73b1..95b483c 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -7,7 +7,7 @@ Tomboy, Conboy and Tomdroid clients are supported. - 0.5.1 + 0.6.0 AGPL3 or later Christian Weiske diff --git a/appinfo/version b/appinfo/version index 4b9fcbe..a918a2a 100755 --- a/appinfo/version +++ b/appinfo/version @@ -1 +1 @@ -0.5.1 +0.6.0 diff --git a/build.xml b/build.xml index 0db8a62..32e6a81 100644 --- a/build.xml +++ b/build.xml @@ -18,6 +18,7 @@ + -- 2.30.2 From a784445c854e5b3dd6ff6719c4ef41a53cd55003 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 18 Sep 2015 23:57:08 +0200 Subject: [PATCH 11/16] mention 0.6.0 in changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index f40c0f5..31ae2d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * Move note filtering onto the SQL server * Register app menu icon more efficiently * Add SVG icon + * Version 0.6.0 2015-06-04 Christian Weiske -- 2.30.2 From 15b372c9ce79ceb2d3c69247622f8c099f4adf7c Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 20 Sep 2015 19:46:07 +0200 Subject: [PATCH 12/16] Fix #20 and #25: Add authorization header workaround for fcgid Apparently the "Authorization" header are passed into PHP as HTTP_XAUTHORIZATION instead of HTTP_AUTHORIZATION. --- lib/oauth.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/oauth.php b/lib/oauth.php index 4a652fc..4bc46dd 100644 --- a/lib/oauth.php +++ b/lib/oauth.php @@ -161,6 +161,11 @@ class OAuth $params = array(); //$_SERVER['REDIRECT_HTTP_AUTHORIZATION'] = $_SERVER['HTTP_AUTHORIZATION']; + //copy http auth headers for apache+php-fcgid work around + if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) { + $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION']; + } + if (isset($_SERVER['HTTP_AUTHORIZATION']) && $_SERVER['HTTP_AUTHORIZATION'] == '' ) { -- 2.30.2 From 3d1e6fe92c4923d2693bfa582a36de16547a098e Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 21 Sep 2015 21:41:06 +0200 Subject: [PATCH 13/16] prepare release 0.6.1 --- ChangeLog | 5 +++++ README.rst | 6 +++--- appinfo/info.xml | 2 +- appinfo/version | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31ae2d8..47b43ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-09-21 Christian Weiske + + * Fix #20 and #25: Add authorization header workaround for fcgid + * Version 0.6.1 + 2015-09-18 Christian Weiske * Fix search in ownCloud 8.1 diff --git a/README.rst b/README.rst index 5b5d65a..7fd2d4e 100644 --- a/README.rst +++ b/README.rst @@ -108,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.6.0.tar.bz2 - $ tar xjvf grauphel-0.6.0.tar.bz2 - $ rm grauphel-0.6.0.tar.bz2 + $ wget http://cweiske.de/download/grauphel/grauphel-0.6.1.tar.bz2 + $ tar xjvf grauphel-0.6.1.tar.bz2 + $ rm grauphel-0.6.1.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 95b483c..cc5ad58 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -7,7 +7,7 @@ Tomboy, Conboy and Tomdroid clients are supported. - 0.6.0 + 0.6.1 AGPL3 or later Christian Weiske diff --git a/appinfo/version b/appinfo/version index a918a2a..ee6cdce 100755 --- a/appinfo/version +++ b/appinfo/version @@ -1 +1 @@ -0.6.0 +0.6.1 -- 2.30.2 From b4d015eda88f8b01d968cab9be74a6cee3b52066 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 22 Sep 2015 17:44:23 +0200 Subject: [PATCH 14/16] Distribute .gz files instead of .bz2 ownCloud 8.x does not support .bz2 archives, only .gz and .zip My fix for it https://github.com/owncloud/core/pull/19182 is currently in the ownCloud 9 milestone, which is expected for next february. This is too long. --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 32e6a81..b271557 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ - + @@ -34,7 +34,7 @@ - + -- 2.30.2 From a921b71a121666b9973e1b2815f55dc416d96d28 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 17 Mar 2016 23:04:53 +0100 Subject: [PATCH 15/16] update installation notes --- README.rst | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 7fd2d4e..5bbae76 100644 --- a/README.rst +++ b/README.rst @@ -93,11 +93,12 @@ 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. +#. Log into owncloud as administrator +#. Goto "Apps" +#. Enable experimental apps in the settings +#. Click "Productivity" +#. Look for "grauphel - Tomboy sync server" +#. Click "Activate" Manual installation @@ -126,12 +127,16 @@ You have to install the PHP PECL oauth extension now. On Debian 7, do the following:: $ apt-get install libpcre3-dev php-pear php5-dev - $ pecl install oauth + $ pecl install oauth-1.2.3 $ echo 'extension=oauth.so' > /etc/php5/conf.d/oauth.ini $ /etc/init.d/apache2 restart Reload the ownCloud page in your browser now. +.. note:: + ``oauth-1.2.3`` is only needed on PHP 5.x + For PHP 7, simply use ``pecl install oauth``. + ====== Author -- 2.30.2 From 26fb49247c6046cb7b3ecec28c5889227515204d Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 17 Mar 2016 23:19:37 +0100 Subject: [PATCH 16/16] update website from build script --- README.rst | 39 +++++++++++++++++++++++++++++++++++++-- build.xml | 11 +++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 5bbae76..a37d21b 100644 --- a/README.rst +++ b/README.rst @@ -106,7 +106,8 @@ Manual installation #. SSH onto your web server #. Navigate to the owncloud ``apps`` directory, often in ``/var/www/owncloud/apps`` -#. Download the latest release from http://cweiske.de/grauphel.htm and extract it. +#. Download the latest release from http://cweiske.de/grauphel.htm#download + and extract it. For example:: $ wget http://cweiske.de/download/grauphel/grauphel-0.6.1.tar.bz2 @@ -135,7 +136,41 @@ Reload the ownCloud page in your browser now. .. note:: ``oauth-1.2.3`` is only needed on PHP 5.x - For PHP 7, simply use ``pecl install oauth``. + For PHP 7 simply use ``pecl install oauth``. + + +======== +Download +======== + +* `grauphel-0.6.1.tar.gz `__, + 35 kiB, 2015-09-22, + SHA256: ``f86cf7b47be857d8a87d413b6315c336e83e9c4beba2cb6ed0eaea8d2b3ea1c3`` + + * `grauphel-0.6.1.tar.bz2 `__, + 31 kiB, 2015-09-21, + SHA256: ``b755b32a453617536eb202cd9d29129df1b04311b633d971108c310a4b9b2e4b`` +* `grauphel-0.6.0.tar.bz2 `__, + 31 kiB, 2015-09-18, + SHA256: ``42e66ed4db1f0c24ca25e46ac4be6e523352f431daaefb22140a2a2e621049b8`` +* `grauphel-0.5.1.tar.bz2 `__, + 29 kiB, 2015-06-04, + SHA256: ``fdb6232fa0d09a72e8355e5e4610403717ffe5c7f7193af2b36d991f1eb76127`` +* `grauphel-0.5.0.tar.bz2 `__, + 29 kiB, 2015-03-17, + SHA256: ``9bbd5426cd7cd36f603c49b0635f24cb9507cf857480edc1f72df0ea0107f7de`` +* `grauphel-0.4.0.tar.bz2 `__, + 24 kiB, 2014-10-29, + SHA256: ``a625ed127af04af4c0a658fcac8156557ef8098eaeddb72281842ad0c0c00b71`` +* `grauphel-0.3.0.tar.bz2 `__, + 17 kiB, 2014-10-14, + SHA256: ``c59ac4cab6d747a4fe89ebd59c92e7ec80f9e2fb3b1edf8904357bc161897ae8`` +* `grauphel-0.2.1.tar.bz2 `__, + 13 kiB, 2014-10-03, + SHA256: ``b66db077fc3e117b2e143b5b177c1d9a8a86c43029936ea65300a4d822e9fdda`` +* `grauphel-0.2.0.tar.bz2 `__, + 13 kiB, 2014-09-27, + SHA256: ``abb1372e8b8525237bea1b686aa6ee2d390974f84bf2206d3aacc2c191978162`` ====== diff --git a/build.xml b/build.xml index b271557..4349f17 100644 --- a/build.xml +++ b/build.xml @@ -39,4 +39,15 @@ + + + + + + + + -- 2.30.2