aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-10-04 19:20:10 -0700
committerzotlabs <mike@macgirvin.com>2018-10-04 19:20:10 -0700
commit3a0a611f15f2789099acf57c6ca93828f5edae46 (patch)
treed928cd86bc856ae80a95a9738fc8a96b8fa23e5b /app
parentd33c331abd3ae500fc7cdac206ea647c4c71905e (diff)
parent1eaf6df842184743ee20ec69931be1ff7136f34e (diff)
downloadvolse-hubzilla-3a0a611f15f2789099acf57c6ca93828f5edae46.tar.gz
volse-hubzilla-3a0a611f15f2789099acf57c6ca93828f5edae46.tar.bz2
volse-hubzilla-3a0a611f15f2789099acf57c6ca93828f5edae46.zip
Merge branch 'dev'
Diffstat (limited to 'app')
-rw-r--r--app/channel.apd4
-rw-r--r--app/defperm.apd6
-rw-r--r--app/directory.apd4
-rw-r--r--app/grid.apd2
-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/premium_channel.apd6
-rw-r--r--app/tokens.apd6
-rw-r--r--app/uexport.apd6
12 files changed, 59 insertions, 5 deletions
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/defperm.apd b/app/defperm.apd
new file mode 100644
index 000000000..9be554543
--- /dev/null
+++ b/app/defperm.apd
@@ -0,0 +1,6 @@
+version: 1
+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..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/grid.apd b/app/grid.apd
index 026b3c349..8688f852c 100644
--- a/app/grid.apd
+++ b/app/grid.apd
@@ -1,4 +1,4 @@
-version: 1.1
+version: 1.2
url: $baseurl/network, $baseurl/settings/network
requires: local_channel
name: Grid
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/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/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/uexport.apd b/app/uexport.apd
new file mode 100644
index 000000000..c7723fa26
--- /dev/null
+++ b/app/uexport.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/uexport
+requires: local_channel
+name: Channel Export
+photo: icon:download
+categories: Personal, System