Link to maintainership/funding post

diff --git a/.travis.yml b/.travis.yml
index c7216ec73284e63b806e2d6857bed9599991eb50..5f179b2434aea274e03e57e4ca81af5f6586cb12 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,8 @@ addons:
     - xsltproc
 php:
   - 7.2
-  - 7.1
-  - 5.6
+  - 7.3
+  - 7.4
 script:
   - cd tests
   - phpunit .

diff --git a/ChangeLog b/ChangeLog
index 0a42100833ee83d0e60d514475c975b44c99d3de..16f6896129312be3b5f3769d32101e02dfea3bc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2021-01-22  Christian Weiske  <cweiske@cweiske.de>
+
+       * Fix Javascript crash on Nextcloud 20
+       * Version 0.7.6
+
+2021-01-17  Christian Weiske  <cweiske@cweiske.de>
+
+       * Fix search with SQLite database
+       * Mark as compatible with Nextcloud 19 and 20
+         (Search does not work with Nextcloud 20)
+       * Version 0.7.5
+
+2020-04-02  Christian Weiske  <cweiske@cweiske.de>
+
+       * Mark 0.7.0 as compatible with Nextcloud 18 by Joan Moreau
+       * Version 0.7.4
+
+2019-12-19  Christian Weiske  <cweiske@cweiske.de>
+
+       * Mark 0.7.0 as compatible with Nextcloud 17 by Joan Moreau
+       * Version 0.7.3
+
+2019-08-07  Christian Weiske  <cweiske@cweiske.de>
+
+       * Mark 0.7.0 as compatible with Nextcloud 16
+       * Version 0.7.2
+
+2019-01-03  Christian Weiske  <cweiske@cweiske.de>
+
+       * Mark 0.7.0 as compatible with Nextcloud 15
+       * Version 0.7.1
+
 2018-10-07  Christian Weiske  <cweiske@cweiske.de>
 
        * Make grauphel compatible with Nextcloud 14

diff --git a/README.rst b/README.rst
index 659b1aea875e5fb277afabc7f0046ac05b90632b..85919f256430be4d2c7f0cd5e36a3e0323851269 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -5,6 +5,8 @@ nextCloud__ application implementing the `Tomboy`__ `REST API`__ for syncing not
 
 Pretty stable.
 
+⚠ `I am looking for a new maintainer / funding <http://cweiske.de/tagebuch/grauphel-maintainer.htm>`_
+
 __ https://nextcloud.com/
 __ https://wiki.gnome.org/Apps/Tomboy
 __ https://wiki.gnome.org/Apps/Tomboy/Synchronization/REST/1.0
@@ -40,12 +42,12 @@ Supported clients
 
 __ http://conboy.garage.maemo.org/
 __ https://wiki.gnome.org/Apps/Tomboy
-__ https://launchpad.net/tomdroid
+__ https://github.com/tomboy-notes/tomdroid
 
 
 Known working versions
 ======================
-grauphel 0.7.0 is known to work with:
+grauphel 0.7.6 is known to work with:
 
 * Tomboy 1.15.2, Linux
 * Tomboy 1.15.1, Windows
@@ -114,9 +116,9 @@ Manual installation
    and extract it.
    For example::
 
-     $ wget http://cweiske.de/download/grauphel/grauphel-0.7.0.tar.gz
-     $ tar xjvf grauphel-0.7.0.tar.gz
-     $ rm grauphel-0.7.0.tar.gz
+     $ wget http://cweiske.de/download/grauphel/grauphel-0.7.6.tar.gz
+     $ tar xjvf grauphel-0.7.6.tar.gz
+     $ rm grauphel-0.7.6.tar.gz
 
    You do have a directory ``/var/www/nextcloud/apps/grauphel`` now.
 #. Using your browser, login as administrator into nextCloud and click
@@ -226,4 +228,4 @@ To release a new version, do the following:
 
    Signature::
 
-     $ openssl dgst -sha512 -sign ~/.nextcloud/certificates/grauphel.key dist/grauphel-0.7.0.tar.gz | openssl base64
+     $ openssl dgst -sha512 -sign ~/.nextcloud/certificates/grauphel.key dist/grauphel-0.7.6.tar.gz | openssl base64

diff --git a/appinfo/application.php b/appinfo/application.php
index 7761eb5a90db76672bd99eb694dcf1c2ea1b9d51..b4de9709f1aead6bb5c2f374092d43acca85cd84 100644 (file)
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -59,6 +59,8 @@ class Application extends App
         $container->registerService(
             'NotesController',
             function($c) {
+                Dependencies::get()->urlGen
+                    = $c->query('ServerContainer')->getURLGenerator();
                 return new \OCA\Grauphel\Controller\NotesController(
                     $c->query('AppName'),
                     $c->query('Request'),

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 0ac34577947be3a74079885d32acc0cd578126d1..1619a5596a1531ecefd09a21c3a09cbec655779a 100755 (executable)
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -9,7 +9,7 @@
 
   Tomboy, Conboy and Tomdroid clients are supported.
  </description>
- <version>0.7.0</version>
+ <version>0.7.6</version>
  <licence>agpl</licence>
  <author>Christian Weiske</author>
  <namespace>Grauphel</namespace>
@@ -23,7 +23,7 @@
  <dependencies>
   <lib>OAuth</lib>
   <owncloud min-version="7"/>
-  <nextcloud min-version="13" max-version="15"/>
+  <nextcloud min-version="13" max-version="20"/>
  </dependencies>
  <!-- <ocsid>166654</ocsid> -->
 </info>

diff --git a/appinfo/version b/appinfo/version
index faef31a4357c48d6e4c55e84c8be8e3bc9055e20..c006218557f7c7b108cc1fcb114fcd0906fbdb04 100755 (executable)
--- a/appinfo/version
+++ b/appinfo/version
@@ -1 +1 @@
-0.7.0
+0.7.6

diff --git a/controller/notescontroller.php b/controller/notescontroller.php
index a54cfe31f1c868eefe2c2184fb1856236d0d3942..b81e1627424f4e6d2e2f08b12bb996a54fa3b112 100644 (file)
--- a/controller/notescontroller.php
+++ b/controller/notescontroller.php
@@ -16,6 +16,7 @@ namespace OCA\Grauphel\Controller;
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http\TemplateResponse;
 use \OCA\Grauphel\Lib\Client;
+use \OCA\Grauphel\Lib\Dependencies;
 use \OCA\Grauphel\Lib\TokenStorage;
 use \OCA\Grauphel\Lib\Response\ErrorResponse;
 
@@ -41,7 +42,8 @@ class NotesController extends Controller
     public function __construct($appName, \OCP\IRequest $request, $user)
     {
         parent::__construct($appName, $request);
-        $this->user   = $user;
+        $this->user = $user;
+        $this->deps = Dependencies::get();
 
         //default http header: we assume something is broken
         header('HTTP/1.0 500 Internal Server Error');
@@ -238,7 +240,7 @@ class NotesController extends Controller
     protected function getNotes()
     {
         $username = $this->user->getUid();
-        $notes  = new \OCA\Grauphel\Lib\NoteStorage($this->urlGen);
+        $notes  = new \OCA\Grauphel\Lib\NoteStorage($this->deps->urlGen);
         $notes->setUsername($username);
         return $notes;
     }

diff --git a/js/loader.js b/js/loader.js
index 84c2342de14ba1b82352e31f6d128d8b1ec66940..8bff3b2766f6f6d2a18e3e687cce5216edcc4c03 100644 (file)
--- a/js/loader.js
+++ b/js/loader.js
@@ -1,4 +1,6 @@
 $(document).ready(function() {
     // translate search result type
-    OC.search.resultTypes.note = 'Note';
-});
\ No newline at end of file
+    if (OC.search !== undefined) {
+        OC.search.resultTypes.note = 'Note';
+    }
+});

diff --git a/lib/notestorage.php b/lib/notestorage.php
index 275374c4ed7f36348cb11c7328cad93fdb1994eb..b430331d67d11a134b971f22697d37b954ebb3ab 100644 (file)
--- a/lib/notestorage.php
+++ b/lib/notestorage.php
@@ -298,8 +298,8 @@ class NoteStorage
             $keywordGroups['NOT'] = array();
         }
 
-        $sqlTplAnd = ' AND (note_title ILIKE ? OR note_tags ILIKE ? OR note_content ILIKE ?)';
-        $sqlTplNot = ' AND NOT (note_title ILIKE ? OR note_tags ILIKE ? OR note_content ILIKE ?)';
+        $sqlTplAnd = ' AND (`note_title` ILIKE ? OR `note_tags` ILIKE ? OR `note_content` ILIKE ?)';
+        $sqlTplNot = ' AND NOT (`note_title` ILIKE ? OR `note_tags` ILIKE ? OR `note_content` ILIKE ?)';
         $arData = array(
             $this->username
         );
@@ -546,4 +546,4 @@ class NoteStorage
         );
     }
 }
-?>
\ No newline at end of file
+?>