From d7dc0e712b127189db23a4005f467e8d759cd76d Mon Sep 17 00:00:00 2001 From: Carlos Ferreira Date: Wed, 16 Nov 2016 01:49:37 +0100 Subject: [PATCH 1/4] Add notes app to OwnCloud --- setup/owncloud.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup/owncloud.sh b/setup/owncloud.sh index b0a59ade..8c766161 100755 --- a/setup/owncloud.sh +++ b/setup/owncloud.sh @@ -46,7 +46,7 @@ InstallOwncloud() { unzip -q /tmp/owncloud.zip -d /usr/local/lib rm -f /tmp/owncloud.zip - # The two apps we actually want are not in ownCloud core. Download the releases from + # The three apps we actually want are not in ownCloud core. Download the releases from # their github repositories. mkdir -p /usr/local/lib/owncloud/apps wget_verify https://github.com/owncloud/contacts/releases/download/v1.4.0.0/contacts.tar.gz c1c22d29699456a45db447281682e8bc3f10e3e7 /tmp/contacts.tgz @@ -56,6 +56,10 @@ InstallOwncloud() { wget_verify https://github.com/nextcloud/calendar/releases/download/v1.4.0/calendar.tar.gz c84f3170efca2a99ea6254de34b0af3cb0b3a821 /tmp/calendar.tgz tar xf /tmp/calendar.tgz -C /usr/local/lib/owncloud/apps/ rm /tmp/calendar.tgz + + wget_verify https://github.com/owncloud/notes/releases/download/v2.0.2/notes-2.0.2.tar.gz 78f001d55ed66686dac13454650f83e0de6adb3b /tmp/notes.tgz + tar xf /tmp/notes.tgz -C /usr/local/lib/owncloud/apps/ + rm /tmp/notes.tgz # Fix weird permissions. chmod 750 /usr/local/lib/owncloud/{apps,config} @@ -264,6 +268,7 @@ hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:disable hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable user_external hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable contacts hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable calendar +hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable notes # When upgrading, run the upgrade script again now that apps are enabled. It seems like # the first upgrade at the top won't work because apps may be disabled during upgrade? From d58f99ea769cbf68ea89a877b7ba481a9f028ede Mon Sep 17 00:00:00 2001 From: Carlos Ferreira Date: Wed, 16 Nov 2016 01:58:26 +0100 Subject: [PATCH 2/4] Update FAQ for ownCloud Notes --- management/templates/sync-guide.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/management/templates/sync-guide.html b/management/templates/sync-guide.html index 3d6fe3e5..40b08d34 100644 --- a/management/templates/sync-guide.html +++ b/management/templates/sync-guide.html @@ -1,7 +1,7 @@

Contacts & Calendar Synchronization

-

This box can hold your contacts and calendar, just like it holds your email.

+

This box can hold your contacts, calendar and notes, just like it holds your email.

@@ -9,12 +9,13 @@

In your browser

-

You can edit your contacts and calendar from your web browser.

+

You can edit your contacts, calendar and notes from your web browser.

+
For... Visit this URL
Contacts https://{{hostname}}/cloud/contacts
Calendar https://{{hostname}}/cloud/calendar
Notes https://{{hostname}}/cloud/calendar

Log in settings are the same as with mail: your @@ -26,13 +27,14 @@

If you set up your mail using Exchange/ActiveSync, your contacts and calendar may already appear on your device.

-

Otherwise, here are some apps that can synchronize your contacts and calendar to your Android phone.

+

Otherwise, here are some apps that can synchronize your contacts, calendar and notes to your Android phone.

+
For... Use...
Contacts and Calendar DAVdroid ($3.69; free here)
Only Contacts CardDAV-Sync free beta (free)
Only Calendar CalDAV-Sync ($2.89)
Only Notes ownNotes ($0.09)

Use the following settings:

From 1be47aa9d2c36fca5d7197bde359b5cbcb916471 Mon Sep 17 00:00:00 2001 From: Carlos Ferreira Date: Wed, 16 Nov 2016 02:20:17 +0100 Subject: [PATCH 3/4] Misspelling --- management/templates/sync-guide.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/management/templates/sync-guide.html b/management/templates/sync-guide.html index 40b08d34..c6693a7a 100644 --- a/management/templates/sync-guide.html +++ b/management/templates/sync-guide.html @@ -1,5 +1,5 @@
-

Contacts & Calendar Synchronization

+

Contacts, Calendar & Notes Synchronization

This box can hold your contacts, calendar and notes, just like it holds your email.

@@ -34,7 +34,7 @@ Contacts and Calendar DAVdroid ($3.69; free here) Only Contacts CardDAV-Sync free beta (free) Only Calendar CalDAV-Sync ($2.89) - Only Notes ownNotes ($0.09) + Only Notes ownNotes ($0.99)

Use the following settings:

From cb7e9a4fcf75169c39c80c7ff14939f7dcbd732f Mon Sep 17 00:00:00 2001 From: Carlos Ferreira Date: Wed, 16 Nov 2016 02:31:45 +0100 Subject: [PATCH 4/4] Add ownCloud notes rewrite on nGinx --- conf/nginx-primaryonly.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx-primaryonly.conf b/conf/nginx-primaryonly.conf index eb446251..4de080c1 100644 --- a/conf/nginx-primaryonly.conf +++ b/conf/nginx-primaryonly.conf @@ -15,7 +15,7 @@ # ownCloud configuration. rewrite ^/cloud$ /cloud/ redirect; rewrite ^/cloud/$ /cloud/index.php; - rewrite ^/cloud/(contacts|calendar|files)$ /cloud/index.php/apps/$1/ redirect; + rewrite ^/cloud/(contacts|calendar|files|notes)$ /cloud/index.php/apps/$1/ redirect; rewrite ^(/cloud/core/doc/[^\/]+/)$ $1/index.html; location /cloud/ { alias /usr/local/lib/owncloud/;