aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/admin.apd6
-rw-r--r--app/articles.apd4
-rw-r--r--app/bookmarks.apd4
-rw-r--r--app/caldav.apd4
-rw-r--r--app/carddav.apd2
-rw-r--r--app/cards.apd4
-rw-r--r--app/channel.apd4
-rw-r--r--app/chat.apd6
-rw-r--r--app/connections.apd4
-rw-r--r--app/defperm.apd6
-rw-r--r--app/directory.apd4
-rw-r--r--app/events.apd4
-rw-r--r--app/group.apd2
-rw-r--r--app/help.apd2
-rw-r--r--app/invite.apd2
-rw-r--r--app/lang.apd2
-rw-r--r--app/mail.apd2
-rw-r--r--app/mood.apd2
-rw-r--r--app/network.apd (renamed from app/grid.apd)6
-rw-r--r--app/notes.apd6
-rw-r--r--app/oauth.apd6
-rw-r--r--app/oauth2.apd6
-rw-r--r--app/pdledit.apd6
-rw-r--r--app/permcats.apd6
-rw-r--r--app/photos.apd4
-rw-r--r--app/poke.apd2
-rw-r--r--app/post.apd2
-rw-r--r--app/premium_channel.apd6
-rw-r--r--app/probe.apd4
-rw-r--r--app/pubstream.apd2
-rw-r--r--app/randprof.apd2
-rw-r--r--app/search.apd2
-rw-r--r--app/sources.apd6
-rw-r--r--app/storage.apd2
-rw-r--r--app/suggest.apd2
-rw-r--r--app/tokens.apd6
-rw-r--r--app/uexport.apd6
-rw-r--r--app/webpages.apd4
-rw-r--r--app/wiki.apd4
39 files changed, 104 insertions, 50 deletions
diff --git a/app/admin.apd b/app/admin.apd
deleted file mode 100644
index 68c07568e..000000000
--- a/app/admin.apd
+++ /dev/null
@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/admin
-requires: admin
-name: Admin
-photo: icon:wrench
-categories: nav_featured_app
diff --git a/app/articles.apd b/app/articles.apd
index 5a9f17e0f..525d0443e 100644
--- a/app/articles.apd
+++ b/app/articles.apd
@@ -1,6 +1,6 @@
-version: 1.2
+version: 2
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/bookmarks.apd b/app/bookmarks.apd
index 33d663217..fc1b68d50 100644
--- a/app/bookmarks.apd
+++ b/app/bookmarks.apd
@@ -1,6 +1,6 @@
-version: 1
+version: 2
url: $baseurl/bookmarks
requires: local_channel
-name: View Bookmarks
+name: Bookmarks
photo: icon:bookmark
categories: Productivity
diff --git a/app/caldav.apd b/app/caldav.apd
index a5839fd6e..30b45b4bd 100644
--- a/app/caldav.apd
+++ b/app/caldav.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/cdav/calendar
+version: 2
+url: $baseurl/cdav/calendar, $baseurl/settings/calendar
requires: local_channel
name: CalDAV
photo: icon:calendar
diff --git a/app/carddav.apd b/app/carddav.apd
index 3b60ebcfe..d32e636b4 100644
--- a/app/carddav.apd
+++ b/app/carddav.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/cdav/addressbook
requires: local_channel
name: CardDAV
diff --git a/app/cards.apd b/app/cards.apd
index 8e2762ff8..780f71e75 100644
--- a/app/cards.apd
+++ b/app/cards.apd
@@ -1,6 +1,6 @@
-version: 1.1
+version: 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..d48266c95 100644
--- a/app/channel.apd
+++ b/app/channel.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/channel/$nick
+version: 2
+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..627c62d12 100644
--- a/app/chat.apd
+++ b/app/chat.apd
@@ -1,6 +1,6 @@
-version: 1
+version: 2
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..0e4c7d670 100644
--- a/app/connections.apd
+++ b/app/connections.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/connections
+version: 2
+url: $baseurl/connections, $baseurl/settings/connections
requires: local_channel
name: Connections
photo: icon:users
diff --git a/app/defperm.apd b/app/defperm.apd
new file mode 100644
index 000000000..2b241ee7f
--- /dev/null
+++ b/app/defperm.apd
@@ -0,0 +1,6 @@
+version: 2
+url: $baseurl/defperms
+requires: local_channel, custom_role
+name: Default Permissions
+photo: icon:unlock-alt
+categories: Access Control
diff --git a/app/directory.apd b/app/directory.apd
index 03a93f042..887c31e30 100644
--- a/app/directory.apd
+++ b/app/directory.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/directory
+version: 2
+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..b69ee35ee 100644
--- a/app/events.apd
+++ b/app/events.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/events
+version: 2
+url: $baseurl/events, $baseurl/settings/events
requires: local_channel
name: Events
photo: icon:calendar
diff --git a/app/group.apd b/app/group.apd
index d16b9237c..da0b31407 100644
--- a/app/group.apd
+++ b/app/group.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/group
requires: local_channel
name: Privacy Groups
diff --git a/app/help.apd b/app/help.apd
index c81584178..a0e6a491b 100644
--- a/app/help.apd
+++ b/app/help.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/help
name: Help
photo: icon:question
diff --git a/app/invite.apd b/app/invite.apd
index 99c2a4eec..5c0e8d09f 100644
--- a/app/invite.apd
+++ b/app/invite.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/invite
requires: local_channel
name: Invite
diff --git a/app/lang.apd b/app/lang.apd
index c30a74654..65495dd5b 100644
--- a/app/lang.apd
+++ b/app/lang.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/lang
name: Language
photo: icon:language
diff --git a/app/mail.apd b/app/mail.apd
index 9df9139f3..f94a2b3c7 100644
--- a/app/mail.apd
+++ b/app/mail.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/mail/combined
requires: local_channel
name: Mail
diff --git a/app/mood.apd b/app/mood.apd
index e05606a0e..dd4e51cec 100644
--- a/app/mood.apd
+++ b/app/mood.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/mood
requires: local_channel
name: Mood
diff --git a/app/grid.apd b/app/network.apd
index c826974a4..f67b48ffe 100644
--- a/app/grid.apd
+++ b/app/network.apd
@@ -1,6 +1,6 @@
-version: 1
-url: $baseurl/network
+version: 2
+url: $baseurl/network, $baseurl/settings/network
requires: local_channel
-name: Grid
+name: Network
photo: icon:th
categories: nav_featured_app, Networking
diff --git a/app/notes.apd b/app/notes.apd
new file mode 100644
index 000000000..01f94c60a
--- /dev/null
+++ b/app/notes.apd
@@ -0,0 +1,6 @@
+version: 2
+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..5e69e4401
--- /dev/null
+++ b/app/oauth.apd
@@ -0,0 +1,6 @@
+version: 2
+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..86828bf24
--- /dev/null
+++ b/app/oauth2.apd
@@ -0,0 +1,6 @@
+version: 2
+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..fbc643296
--- /dev/null
+++ b/app/pdledit.apd
@@ -0,0 +1,6 @@
+version: 2
+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..e9fd6e56f
--- /dev/null
+++ b/app/permcats.apd
@@ -0,0 +1,6 @@
+version: 2
+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..b28b315cd 100644
--- a/app/photos.apd
+++ b/app/photos.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/photos/$nick
+version: 2
+url: $baseurl/photos/$nick, $baseurl/settings/photos
requires: local_channel
name: Photos
photo: icon:photo
diff --git a/app/poke.apd b/app/poke.apd
index 37b640fb8..cf23c29b4 100644
--- a/app/poke.apd
+++ b/app/poke.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/poke
requires: local_channel
name: Poke
diff --git a/app/post.apd b/app/post.apd
index 08e5ccf0c..d3ce88454 100644
--- a/app/post.apd
+++ b/app/post.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/rpost?f=&body=
requires: observer
name: Post
diff --git a/app/premium_channel.apd b/app/premium_channel.apd
new file mode 100644
index 000000000..9764051d1
--- /dev/null
+++ b/app/premium_channel.apd
@@ -0,0 +1,6 @@
+version: 2
+url: $baseurl/connect/$nick
+requires: local_channel
+name: Premium Channel
+photo: icon:check-circle-o
+categories: Networking
diff --git a/app/probe.apd b/app/probe.apd
index c7b849ee1..097219292 100644
--- a/app/probe.apd
+++ b/app/probe.apd
@@ -1,6 +1,6 @@
-version: 1
+version: 2
url: $baseurl/probe
requires: local_channel
name: Remote Diagnostics
photo: icon:user-md
-categories: System
+categories: Developer
diff --git a/app/pubstream.apd b/app/pubstream.apd
index ce9997126..4447ca750 100644
--- a/app/pubstream.apd
+++ b/app/pubstream.apd
@@ -1,4 +1,4 @@
-version: 2.2
+version: 2
url: $baseurl/pubstream
requires: public_stream
name: Public Stream
diff --git a/app/randprof.apd b/app/randprof.apd
index 1b2addd5c..60281d909 100644
--- a/app/randprof.apd
+++ b/app/randprof.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/randprof
name: Random Channel
target: randprof
diff --git a/app/search.apd b/app/search.apd
index 9eb24ad41..462561f33 100644
--- a/app/search.apd
+++ b/app/search.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/search
name: Search
photo: icon:search
diff --git a/app/sources.apd b/app/sources.apd
new file mode 100644
index 000000000..deeeae0a2
--- /dev/null
+++ b/app/sources.apd
@@ -0,0 +1,6 @@
+version: 2
+url: $baseurl/sources
+requires: local_channel
+name: Channel Sources
+photo: icon:commenting-o
+categories: Networking
diff --git a/app/storage.apd b/app/storage.apd
index cafcf81e8..ea15a2ef2 100644
--- a/app/storage.apd
+++ b/app/storage.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/cloud/$nick
requires: local_channel
name: Files
diff --git a/app/suggest.apd b/app/suggest.apd
index 51b555264..0fdd8a399 100644
--- a/app/suggest.apd
+++ b/app/suggest.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
url: $baseurl/suggest
requires: local_channel
name: Suggest Channels
diff --git a/app/tokens.apd b/app/tokens.apd
new file mode 100644
index 000000000..f271dc56c
--- /dev/null
+++ b/app/tokens.apd
@@ -0,0 +1,6 @@
+version: 2
+url: $baseurl/tokens
+requires: local_channel
+name: Guest Access
+photo: icon:user-secret
+categories: Access Control
diff --git a/app/uexport.apd b/app/uexport.apd
new file mode 100644
index 000000000..773d74429
--- /dev/null
+++ b/app/uexport.apd
@@ -0,0 +1,6 @@
+version: 2
+url: $baseurl/uexport
+requires: local_channel
+name: Channel Export
+photo: icon:download
+categories: Personal, System
diff --git a/app/webpages.apd b/app/webpages.apd
index 46c6cdb5d..1c215512f 100644
--- a/app/webpages.apd
+++ b/app/webpages.apd
@@ -1,6 +1,6 @@
-version: 1
+version: 2
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..e2fbe77e1 100644
--- a/app/wiki.apd
+++ b/app/wiki.apd
@@ -1,6 +1,6 @@
-version: 1
+version: 2
url: $baseurl/wiki/$nick
-requires: local_channel, wiki
+requires: local_channel
name: Wiki
photo: icon:pencil-square-o
categories: nav_featured_app, Productivity