From 37a889d9780314af06c373c7e605e9606238f34e Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Wed, 19 Dec 2018 00:13:33 -0100
Subject: Merge branch 'master' into framework-import-process+activity

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 appinfo/info.xml   | 22 ++++++++++++++--------
 appinfo/routes.php |  1 +
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'appinfo')

diff --git a/appinfo/info.xml b/appinfo/info.xml
index f8d819ed..6520f085 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -26,25 +26,24 @@
 	<namespace>Social</namespace>
 	<category>social</category>
 	<website>https://github.com/nextcloud/social</website>
-	<repository type="git">https://github.com/nextcloud/social.git</repository>
 	<bugs>https://github.com/nextcloud/social/issues</bugs>
+	<repository type="git">https://github.com/nextcloud/social.git</repository>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/social/master/img/screenshot.png</screenshot>
 	<dependencies>
 		<nextcloud min-version="15" max-version="16"/>
 	</dependencies>
-	<navigations>
-		<navigation>
-			<name>Social</name>
-			<route>social.Navigation.navigate</route>
-			<order>6</order>
-		</navigation>
-	</navigations>
 
 	<background-jobs>
 		<job>OCA\Social\Cron\Cache</job>
 		<job>OCA\Social\Cron\Queue</job>
 	</background-jobs>
 
+	<repair-steps>
+		<post-migration>
+			<step>OCA\Social\Migration\CheckInstallation</step>
+		</post-migration>
+	</repair-steps>
+
 	<commands>
 		<command>OCA\Social\Command\CacheRefresh</command>
 		<command>OCA\Social\Command\NoteCreate</command>
@@ -52,4 +51,11 @@
 		<command>OCA\Social\Command\QueueProcess</command>
 	</commands>
 
+	<navigations>
+		<navigation>
+			<name>Social</name>
+			<route>social.Navigation.navigate</route>
+			<order>6</order>
+		</navigation>
+	</navigations>
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index 6a595a4e..506a89aa 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -65,6 +65,7 @@ return [
 		['name' => 'SocialPub#displayPost', 'url' => '/@{username}/{postId}', 'verb' => 'GET'],
 
 		['name' => 'Local#streamHome', 'url' => '/api/v1/stream/home', 'verb' => 'GET'],
+		['name' => 'Local#streamNotifications', 'url' => '/api/v1/stream/notifications', 'verb' => 'GET'],
 		['name' => 'Local#streamTimeline', 'url' => '/api/v1/stream/timeline', 'verb' => 'GET'],
 		['name' => 'Local#streamFederated', 'url' => '/api/v1/stream/federated', 'verb' => 'GET'],
 		['name' => 'Local#streamDirect', 'url' => '/api/v1/stream/direct', 'verb' => 'GET'],
-- 
cgit v1.2.3