Merge branch 'patch-29' into 'dev'

Patch 29

See merge request Kostikov/core!3

20 files changed, 73 insertions, 25 deletions

diff --git a/app/articles.apd b/app/articles.apd
index 5a9f17e0f..00b3c4a3c 100644
--- a/app/articles.apd
+++ b/app/articles.apd
@@ -1,6 +1,6 @@
-version: 1.2
+version: 1.3
 url: $baseurl/articles/$nick
 name: Articles
-requires: local_channel, articles
+requires: local_channel
 photo: icon:file-text-o
 categories: nav_featured_app, Productivity
diff --git a/app/caldav.apd b/app/caldav.apd
index a5839fd6e..f1938a9fb 100644
--- a/app/caldav.apd
+++ b/app/caldav.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/cdav/calendar
+version: 1.1
+url: $baseurl/cdav/calendar, $baseurl/settings/calendar
 requires: local_channel
 name: CalDAV
 photo: icon:calendar
diff --git a/app/cards.apd b/app/cards.apd
index 8e2762ff8..ecc61b7f9 100644
--- a/app/cards.apd
+++ b/app/cards.apd
@@ -1,6 +1,6 @@
-version: 1.1
+version: 1.2
 url: $baseurl/cards/$nick
 name: Cards
-requires: local_channel, cards
+requires: local_channel
 photo: icon:list
 categories: nav_featured_app, Productivity
diff --git a/app/channel.apd b/app/channel.apd
index ab79e7047..f0f435ef5 100644
--- a/app/channel.apd
+++ b/app/channel.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/channel/$nick
+version: 1.1
+url: $baseurl/channel/$nick, $baseurl/settings/channel_home
 requires: local_channel
 name: Channel Home
 photo: icon:home
diff --git a/app/chat.apd b/app/chat.apd
index b59d846a6..524c13bfd 100644
--- a/app/chat.apd
+++ b/app/chat.apd
@@ -1,6 +1,6 @@
-version: 1
+version: 1.1
 url: $baseurl/chat/$nick
-requires: local_channel, ajaxchat
-name: My Chatrooms
+requires: local_channel
+name: Chatrooms
 photo: icon:comments-o
 categories: Productivity
diff --git a/app/connections.apd b/app/connections.apd
index 631f093a8..6ab5977af 100644
--- a/app/connections.apd
+++ b/app/connections.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/connections
+version: 1.1
+url: $baseurl/connections, $baseurl/settings/connections
 requires: local_channel
 name: Connections
 photo: icon:users
diff --git a/app/directory.apd b/app/directory.apd
index 03a93f042..0c723c16b 100644
--- a/app/directory.apd
+++ b/app/directory.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/directory
+version: 1.1
+url: $baseurl/directory, $baseurl/settings/directory
 name: Directory
 photo: icon:sitemap
 categories: nav_featured_app, Networking
diff --git a/app/events.apd b/app/events.apd
index dc3257d77..edd85959d 100644
--- a/app/events.apd
+++ b/app/events.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/events
+version: 1.1
+url: $baseurl/events, $baseurl/settings/events
 requires: local_channel
 name: Events
 photo: icon:calendar
diff --git a/app/grid.apd b/app/grid.apd
index c826974a4..026b3c349 100644
--- a/app/grid.apd
+++ b/app/grid.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/network
+version: 1.1
+url: $baseurl/network, $baseurl/settings/network
 requires: local_channel
 name: Grid
 photo: icon:th
diff --git a/app/notes.apd b/app/notes.apd
new file mode 100644
index 000000000..ba7e2bbc1
--- /dev/null
+++ b/app/notes.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/notes
+requires: local_channel
+name: Notes
+photo: icon:sticky-note-o
+categories: Personal, Productivity
diff --git a/app/oauth.apd b/app/oauth.apd
new file mode 100644
index 000000000..4771773ed
--- /dev/null
+++ b/app/oauth.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/oauth
+requires: local_channel
+name: OAuth Apps Manager
+photo: icon:chevron-circle-up
+categories: Access Control
diff --git a/app/oauth2.apd b/app/oauth2.apd
new file mode 100644
index 000000000..21fa44c97
--- /dev/null
+++ b/app/oauth2.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/oauth2
+requires: local_channel
+name: OAuth2 Apps Manager
+photo: icon:chevron-circle-up
+categories: Access Control
diff --git a/app/pdledit.apd b/app/pdledit.apd
new file mode 100644
index 000000000..ae62d4ff3
--- /dev/null
+++ b/app/pdledit.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/pdledit
+requires: local_channel
+name: PDL Editor
+photo: icon:object-group
+categories: Appearance
diff --git a/app/permcats.apd b/app/permcats.apd
new file mode 100644
index 000000000..6a961b87e
--- /dev/null
+++ b/app/permcats.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/permcats
+requires: local_channel
+name: Permission Categories
+photo: icon:unlock-alt
+categories: Access Control
diff --git a/app/photos.apd b/app/photos.apd
index 048e623bb..09b4eb0fd 100644
--- a/app/photos.apd
+++ b/app/photos.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/photos/$nick
+version: 1.1
+url: $baseurl/photos/$nick, $baseurl/settings/photos
 requires: local_channel
 name: Photos
 photo: icon:photo
diff --git a/app/premium_channel.apd b/app/premium_channel.apd
new file mode 100644
index 000000000..263dd5701
--- /dev/null
+++ b/app/premium_channel.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/connect/$nick
+requires: local_channel
+name: Premium Channel
+photo: icon:check-circle-o
+categories: Networking
diff --git a/app/sources.apd b/app/sources.apd
new file mode 100644
index 000000000..69dd0aac0
--- /dev/null
+++ b/app/sources.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/sources
+requires: local_channel
+name: Channel Sources
+photo: icon:commenting-o
+categories: Networking
diff --git a/app/tokens.apd b/app/tokens.apd
new file mode 100644
index 000000000..6cb66cbd7
--- /dev/null
+++ b/app/tokens.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/tokens
+requires: local_channel
+name: Guest Access
+photo: icon:user-secret
+categories: Access Control
diff --git a/app/webpages.apd b/app/webpages.apd
index 46c6cdb5d..e98cc0794 100644
--- a/app/webpages.apd
+++ b/app/webpages.apd
@@ -1,6 +1,6 @@
-version: 1
+version: 1.1
 url: $baseurl/webpages/$nick
-requires: local_channel, webpages
+requires: local_channel
 name: Webpages
 photo: icon:newspaper-o
 categories: nav_featured_app, Productivity
diff --git a/app/wiki.apd b/app/wiki.apd
index 48fcbe0c1..56edfde20 100644
--- a/app/wiki.apd
+++ b/app/wiki.apd
@@ -1,6 +1,6 @@
-version: 1
+version: 1.1
 url: $baseurl/wiki/$nick
-requires: local_channel, wiki
+requires: local_channel
 name: Wiki
 photo: icon:pencil-square-o
 categories: nav_featured_app, Productivity