Merge branch 'master' of github.com:/nextcloud/mail into release-0.7

1 files changed, 69 insertions, 46 deletions

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 81e9852a1..7b8f72049 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -20,54 +20,77 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-
 $app = new \OCA\Mail\AppInfo\Application();
 $app->registerRoutes($this,
 	[
-		'routes' => [
-			['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
-			['name' => 'page#compose', 'url' => '/compose', 'verb' => 'GET'],
-			['name' => 'accounts#send', 'url' => '/accounts/{accountId}/send', 'verb' => 'POST'],
-			['name' => 'accounts#draft', 'url' => '/accounts/{accountId}/draft', 'verb' => 'POST'],
-			[
-				'name' => 'messages#downloadAttachment',
-				'url' => '/accounts/{accountId}/folders/{folderId}/messages/{messageId}/attachment/{attachmentId}',
-				'verb' => 'GET'],
-			[
-				'name' => 'messages#saveAttachment',
-				'url' => '/accounts/{accountId}/folders/{folderId}/messages/{messageId}/attachment/{attachmentId}',
-				'verb' => 'POST'],
-			[
-				'name' => 'messages#getHtmlBody',
-				'url' => '/accounts/{accountId}/folders/{folderId}/messages/{messageId}/html',
-				'verb' => 'GET'],
-			[
-				'name' => 'messages#setFlags',
-				'url' => '/accounts/{accountId}/folders/{folderId}/messages/{messageId}/flags',
-				'verb' => 'PUT'],
-			[
-				'name' => 'messages#move',
-				'url' => '/accounts/{accountId}/folders/{folderId}/messages/{id}/move',
-				'verb' => 'POST'],
-			[
-				'name' => 'proxy#redirect',
-				'url' => '/redirect',
-				'verb' => 'GET'],
-			[
-				'name' => 'proxy#proxy',
-				'url' => '/proxy',
-				'verb' => 'GET'],
-			[
-				'name' => 'folders#detectChanges',
-				'url' => '/accounts/{accountId}/folders/detectChanges',
-				'verb' => 'POST'],
+	'routes' => [
+		[
+			'name' => 'page#index',
+			'url' => '/',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'page#compose',
+			'url' => '/compose',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'accounts#send',
+			'url' => '/accounts/{accountId}/send',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'accounts#draft',
+			'url' => '/accounts/{accountId}/draft',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'folders#sync',
+			'url' => '/accounts/{accountId}/folders/{folderId}/sync',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'messages#downloadAttachment',
+			'url' => '/accounts/{accountId}/folders/{folderId}/messages/{messageId}/attachment/{attachmentId}',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'messages#saveAttachment',
+			'url' => '/accounts/{accountId}/folders/{folderId}/messages/{messageId}/attachment/{attachmentId}',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'messages#getHtmlBody',
+			'url' => '/accounts/{accountId}/folders/{folderId}/messages/{messageId}/html',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'messages#setFlags',
+			'url' => '/accounts/{accountId}/folders/{folderId}/messages/{messageId}/flags',
+			'verb' => 'PUT'
+		],
+		[
+			'name' => 'messages#move',
+			'url' => '/accounts/{accountId}/folders/{folderId}/messages/{id}/move',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'proxy#redirect',
+			'url' => '/redirect',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'proxy#proxy',
+			'url' => '/proxy',
+			'verb' => 'GET'
 		],
-		'resources' => [
-			'autoComplete' => ['url' => '/autoComplete'],
+	],
+	'resources' => [
+		'autoComplete' => ['url' => '/autoComplete'],
 			'localAttachments' => ['url' => '/attachments'],
-			'accounts' => ['url' => '/accounts'],
-			'folders' => ['url' => '/accounts/{accountId}/folders'],
-			'messages' => ['url' => '/accounts/{accountId}/folders/{folderId}/messages'],
-			'aliases' => ['url' => '/accounts/{accountId}/aliases'],
-		]
-	]);
+		'accounts' => ['url' => '/accounts'],
+		'folders' => ['url' => '/accounts/{accountId}/folders'],
+		'messages' => ['url' => '/accounts/{accountId}/folders/{folderId}/messages'],
+		'aliases' => ['url' => '/accounts/{accountId}/aliases'],
+	]
+]);