Merge remote-tracking branch 'upstream/dev' into dev

61 files changed, 85 insertions, 42 deletions

diff --git a/app/affinity.apd b/app/affinity.apd
index 3860581aa..7821a2a6f 100644
--- a/app/affinity.apd
+++ b/app/affinity.apd
@@ -1,4 +1,4 @@
-version: 1
+version: 2
 url: $baseurl/affinity
 requires: local_channel
 name: Affinity Tool
diff --git a/app/articles.apd b/app/articles.apd
index 525d0443e..5ef849dfb 100644
--- a/app/articles.apd
+++ b/app/articles.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/articles/$nick
 name: Articles
 requires: local_channel
 photo: icon:file-text-o
 categories: nav_featured_app, Productivity
+desc: Create interactive articles
diff --git a/app/bookmarks.apd b/app/bookmarks.apd
index fc1b68d50..a12650498 100644
--- a/app/bookmarks.apd
+++ b/app/bookmarks.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/bookmarks
 requires: local_channel
 name: Bookmarks
 photo: icon:bookmark
 categories: Productivity
+desc: This app enables you to bookmark links from posts or comments and provides a simple management interface
diff --git a/app/bookmarks.png b/app/bookmarks.png
deleted file mode 100644
index fffad3329..000000000
--- a/app/bookmarks.png
+++ /dev/null
diff --git a/app/bugreport.apd b/app/bugreport.apd
index f1f328013..52a2ba19c 100644
--- a/app/bugreport.apd
+++ b/app/bugreport.apd
@@ -1,5 +1,6 @@
-version: 2
+version: 3
 url: https://framagit.org/hubzilla/core/issues
 name: Report Bug
 photo: icon:bug
 categories: System
+desc: Provides a link to the Hubzilla bug tracker.
diff --git a/app/bugreport.png b/app/bugreport.png
deleted file mode 100644
index 4b59da185..000000000
--- a/app/bugreport.png
+++ /dev/null
diff --git a/app/calendar.apd b/app/calendar.apd
index 8de046e48..9398e6aa9 100644
--- a/app/calendar.apd
+++ b/app/calendar.apd
@@ -1,6 +1,7 @@
-version: 1
+version: 2
 url: $baseurl/cdav/calendar, $baseurl/settings/calendar
 requires: local_channel
 name: Calendar
 photo: icon:calendar
 categories: Productivity, nav_featured_app
+desc: DAV capable calendar
diff --git a/app/carddav.apd b/app/carddav.apd
index d32e636b4..c06407d97 100644
--- a/app/carddav.apd
+++ b/app/carddav.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/cdav/addressbook
 requires: local_channel
 name: CardDAV
 photo: icon:vcard-o
 categories: Productivity, Personal
+desc: DAV capable addressbook
diff --git a/app/cards.apd b/app/cards.apd
index 780f71e75..00cfa05a8 100644
--- a/app/cards.apd
+++ b/app/cards.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/cards/$nick
 name: Cards
 requires: local_channel
 photo: icon:list
 categories: nav_featured_app, Productivity
+desc: Create interactive personal planning cards.
diff --git a/app/channel.apd b/app/channel.apd
index d48266c95..7e7727ebe 100644
--- a/app/channel.apd
+++ b/app/channel.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 4
 url: $baseurl/channel/$nick, $baseurl/settings/channel_home
 requires: local_channel
-name: Channel Home
+name: Channel
 photo: icon:home
 categories: nav_featured_app, Personal
+desc: Your channel homepage featuring your personal posts.
diff --git a/app/chat.apd b/app/chat.apd
index 627c62d12..cac192ab2 100644
--- a/app/chat.apd
+++ b/app/chat.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/chat/$nick
 requires: local_channel
 name: Chatrooms
 photo: icon:comments-o
 categories: Productivity
+desc: Access controlled personal chatrooms.
diff --git a/app/chat.png b/app/chat.png
deleted file mode 100644
index 9d3fdebd7..000000000
--- a/app/chat.png
+++ /dev/null
diff --git a/app/connections.apd b/app/connections.apd
index 0e4c7d670..006d2cde2 100644
--- a/app/connections.apd
+++ b/app/connections.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/connections, $baseurl/settings/connections
 requires: local_channel
 name: Connections
 photo: icon:users
 categories: nav_featured_app, Networking
+desc: Manage your connections.
diff --git a/app/connections.png b/app/connections.png
deleted file mode 100644
index 6f6100761..000000000
--- a/app/connections.png
+++ /dev/null
diff --git a/app/defperm.apd b/app/defperm.apd
index 2b241ee7f..18259c7b1 100644
--- a/app/defperm.apd
+++ b/app/defperm.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/defperms
 requires: local_channel, custom_role
 name: Default Permissions
 photo: icon:unlock-alt
 categories: Access Control
+desc: Set custom default permissions for new connections.
diff --git a/app/directory.apd b/app/directory.apd
index 887c31e30..10d9054ff 100644
--- a/app/directory.apd
+++ b/app/directory.apd
@@ -1,5 +1,6 @@
-version: 2
+version: 3
 url: $baseurl/directory, $baseurl/settings/directory
 name: Directory
 photo: icon:sitemap
 categories: nav_featured_app, Networking
+desc: Members directory of the Zot network.
diff --git a/app/directory.png b/app/directory.png
deleted file mode 100644
index 659f69051..000000000
--- a/app/directory.png
+++ /dev/null
diff --git a/app/firefoxshare.png b/app/firefoxshare.png
deleted file mode 100644
index 755952284..000000000
--- a/app/firefoxshare.png
+++ /dev/null
diff --git a/app/group.apd b/app/group.apd
index da0b31407..bf3ddf4a1 100644
--- a/app/group.apd
+++ b/app/group.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 4
 url: $baseurl/group
 requires: local_channel
 name: Privacy Groups
-photo: icon:users
+photo: icon:lock
 categories: Networking
+desc: A tool to create and manage privacy groups.
diff --git a/app/help.apd b/app/help.apd
index a0e6a491b..41f9cb6a0 100644
--- a/app/help.apd
+++ b/app/help.apd
@@ -1,5 +1,6 @@
-version: 2
+version: 3
 url: $baseurl/help
 name: Help
 photo: icon:question
 categories: nav_featured_app, System
+desc: The Hubzilla help pages.
diff --git a/app/help.png b/app/help.png
deleted file mode 100644
index 6b9b1ccb6..000000000
--- a/app/help.png
+++ /dev/null
diff --git a/app/home.png b/app/home.png
deleted file mode 100644
index 4b45f2a7a..000000000
--- a/app/home.png
+++ /dev/null
diff --git a/app/hq.apd b/app/hq.apd
new file mode 100644
index 000000000..07f82653f
--- /dev/null
+++ b/app/hq.apd
@@ -0,0 +1,7 @@
+version: 2
+url: $baseurl/hq
+requires: local_channel
+name: HQ
+photo: icon:user-circle-o
+categories: nav_pinned_app
+desc: The default landing page after login. It provides a quick overview over recent posts and direct messages.
diff --git a/app/invite.apd b/app/invite.apd
index 5c0e8d09f..8506408a6 100644
--- a/app/invite.apd
+++ b/app/invite.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/invite
 requires: local_channel
 name: Invite
 photo: icon:user-plus
 categories: Networking
+desc: Send invite emails with an invite token. This app only works if your hub is configured to allow invites.
diff --git a/app/invite.png b/app/invite.png
deleted file mode 100644
index dbc2cbbfa..000000000
--- a/app/invite.png
+++ /dev/null
diff --git a/app/lang.apd b/app/lang.apd
index 65495dd5b..27e2d7c84 100644
--- a/app/lang.apd
+++ b/app/lang.apd
@@ -1,5 +1,6 @@
-version: 2
+version: 3
 url: $baseurl/lang
 name: Language
 photo: icon:language
 categories: System
+desc: A simple language selector.
diff --git a/app/lang.png b/app/lang.png
deleted file mode 100644
index 89a61c26a..000000000
--- a/app/lang.png
+++ /dev/null
diff --git a/app/login.png b/app/login.png
deleted file mode 100644
index 4e5625ee7..000000000
--- a/app/login.png
+++ /dev/null
diff --git a/app/mood.apd b/app/mood.apd
index dd4e51cec..81b53a2ce 100644
--- a/app/mood.apd
+++ b/app/mood.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/mood
 requires: local_channel
 name: Mood
 photo: icon:smile-o
 categories: Social
+desc: Set your current mood and tell your friends.
diff --git a/app/mood.png b/app/mood.png
deleted file mode 100644
index 2a5c1aca6..000000000
--- a/app/mood.png
+++ /dev/null
diff --git a/app/network.apd b/app/network.apd
index f67b48ffe..cbce18153 100644
--- a/app/network.apd
+++ b/app/network.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/network, $baseurl/settings/network
 requires: local_channel
 name: Network
 photo: icon:th
 categories: nav_featured_app, Networking
+desc: Your network activity in a traditional timeline view.
diff --git a/app/notes.apd b/app/notes.apd
index 01f94c60a..20794ebb4 100644
--- a/app/notes.apd
+++ b/app/notes.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/notes
 requires: local_channel
 name: Notes
 photo: icon:sticky-note-o
 categories: Personal, Productivity
+desc: A simple notes app. It provides a dedicated notes app and a widget which can be added to other pages.
diff --git a/app/oauth.apd b/app/oauth.apd
index 5e69e4401..32a0f6d11 100644
--- a/app/oauth.apd
+++ b/app/oauth.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/oauth
 requires: local_channel
 name: OAuth Apps Manager
 photo: icon:chevron-circle-up
 categories: Access Control
+desc: Manage OAuth authentication tokens for mobile and remote apps.
diff --git a/app/oauth2.apd b/app/oauth2.apd
index 86828bf24..c1422e505 100644
--- a/app/oauth2.apd
+++ b/app/oauth2.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/oauth2
 requires: local_channel
 name: OAuth2 Apps Manager
 photo: icon:chevron-circle-up
 categories: Access Control
+desc: Manage OAuth2 authentication tokens for mobile and remote apps.
diff --git a/app/pdledit.apd b/app/pdledit_gui.apd
index fbc643296..85a95a067 100644
--- a/app/pdledit.apd
+++ b/app/pdledit_gui.apd
@@ -1,6 +1,7 @@
-version: 2
-url: $baseurl/pdledit
+version: 1
+url: $baseurl/pdledit_gui
 requires: local_channel
 name: PDL Editor
 photo: icon:object-group
 categories: Appearance
+desc: An editor for system page layouts.
diff --git a/app/permcats.apd b/app/permcats.apd
index e9fd6e56f..d71eedb4f 100644
--- a/app/permcats.apd
+++ b/app/permcats.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 5
 url: $baseurl/permcats
 requires: local_channel
-name: Permission Categories
-photo: icon:unlock-alt
+name: Contact Roles
+photo: icon:user-o
 categories: Access Control
+desc: Create and manage custom contact roles.
diff --git a/app/photos.apd b/app/photos.apd
index b28b315cd..e861747cb 100644
--- a/app/photos.apd
+++ b/app/photos.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/photos/$nick, $baseurl/settings/photos
 requires: local_channel
 name: Photos
 photo: icon:photo
 categories: nav_featured_app, Multimedia
+desc: A simple tool to view and manage your photos.
diff --git a/app/photos.png b/app/photos.png
deleted file mode 100644
index 59b038288..000000000
--- a/app/photos.png
+++ /dev/null
diff --git a/app/poke.apd b/app/poke.apd
index cf23c29b4..490f98740 100644
--- a/app/poke.apd
+++ b/app/poke.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/poke
 requires: local_channel
 name: Poke
 photo: icon:hand-o-right
 categories: Social
+desc: Poke somebody in your addressbook.
diff --git a/app/poke.png b/app/poke.png
deleted file mode 100644
index 9655d54ff..000000000
--- a/app/poke.png
+++ /dev/null
diff --git a/app/post.apd b/app/post.apd
index d3ce88454..d5ea7ce88 100644
--- a/app/post.apd
+++ b/app/post.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/rpost?f=&body=
 requires: observer
 name: Post
 photo: icon:pencil-square
 categories: Productivity
+desc: A separate post editor.
diff --git a/app/post.png b/app/post.png
deleted file mode 100644
index 4a4355581..000000000
--- a/app/post.png
+++ /dev/null
diff --git a/app/pphoto.png b/app/pphoto.png
deleted file mode 100644
index 041ff1e0c..000000000
--- a/app/pphoto.png
+++ /dev/null
diff --git a/app/probe.apd b/app/probe.apd
index 1cc8bd991..9a78f4cde 100644
--- a/app/probe.apd
+++ b/app/probe.apd
@@ -1,6 +1,7 @@
-version: 3
+version: 4
 url: $baseurl/zot_probe
 requires: local_channel
 name: Remote Diagnostics
 photo: icon:user-md
 categories: Developer
+desc: A diagnose tool useful for developers.
diff --git a/app/probe.png b/app/probe.png
deleted file mode 100644
index 21bd85cd9..000000000
--- a/app/probe.png
+++ /dev/null
diff --git a/app/pubstream.apd b/app/pubstream.apd
index 4447ca750..9631a19fd 100644
--- a/app/pubstream.apd
+++ b/app/pubstream.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/pubstream
 requires: public_stream
 name: Public Stream
 photo: icon:globe
 categories: Social, nav_featured_app
+desc: View the unmoderated public content known to this hub.
diff --git a/app/randprof.apd b/app/randprof.apd
index 60281d909..4979a15c1 100644
--- a/app/randprof.apd
+++ b/app/randprof.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/randprof
 name: Random Channel
 target: randprof
 photo: icon:random
 categories: Networking
+desc: Visit a random channel in the network.
diff --git a/app/randprof.png b/app/randprof.png
deleted file mode 100644
index 7bb438dcd..000000000
--- a/app/randprof.png
+++ /dev/null
diff --git a/app/search.apd b/app/search.apd
index 462561f33..6cf51f11f 100644
--- a/app/search.apd
+++ b/app/search.apd
@@ -1,4 +1,5 @@
-version: 2
+version: 3
 url: $baseurl/search
 name: Search
 photo: icon:search
+desc: A separate search app to look up content, channels, tags, documentation or remote content depending on the search string prefix.
diff --git a/app/search.png b/app/search.png
deleted file mode 100644
index 505d93c3f..000000000
--- a/app/search.png
+++ /dev/null
diff --git a/app/sources.apd b/app/sources.apd
index deeeae0a2..d3a43dd04 100644
--- a/app/sources.apd
+++ b/app/sources.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/sources
 requires: local_channel
 name: Channel Sources
 photo: icon:commenting-o
 categories: Networking
+desc: Import channel content from other channels or feeds.
diff --git a/app/storage.apd b/app/storage.apd
index ea15a2ef2..a81af9c52 100644
--- a/app/storage.apd
+++ b/app/storage.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/cloud/$nick
 requires: local_channel
 name: Files
 photo: icon:folder-open
 categories: nav_featured_app, Productivity
+desc: A mighty tool to manage your files and folders.
diff --git a/app/storage.png b/app/storage.png
deleted file mode 100644
index ad8b89f6a..000000000
--- a/app/storage.png
+++ /dev/null
diff --git a/app/suggest.apd b/app/suggest.apd
index 0fdd8a399..56bced0dc 100644
--- a/app/suggest.apd
+++ b/app/suggest.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/suggest
 requires: local_channel
 name: Suggest Channels
 photo: icon:lightbulb-o
 categories: Networking
+desc: Suggestions for channels in the network you might be interested in.
diff --git a/app/suggest.png b/app/suggest.png
deleted file mode 100644
index ca9180528..000000000
--- a/app/suggest.png
+++ /dev/null
diff --git a/app/tokens.apd b/app/tokens.apd
index f271dc56c..95506f11c 100644
--- a/app/tokens.apd
+++ b/app/tokens.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/tokens
 requires: local_channel
 name: Guest Access
 photo: icon:user-secret
 categories: Access Control
+desc: Create and manage guest access tokens. Those tokens are useful to share private content with people outside the Zot network.
diff --git a/app/uexport.apd b/app/uexport.apd
index 773d74429..25cd91549 100644
--- a/app/uexport.apd
+++ b/app/uexport.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/uexport
 requires: local_channel
 name: Channel Export
 photo: icon:download
 categories: Personal, System
+desc: Export your channel.
diff --git a/app/webpages.apd b/app/webpages.apd
index 1c215512f..e72b8586b 100644
--- a/app/webpages.apd
+++ b/app/webpages.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/webpages/$nick
 requires: local_channel
 name: Webpages
 photo: icon:newspaper-o
 categories: nav_featured_app, Productivity
+desc: Create and manage web pages for your channel.
diff --git a/app/webpages.png b/app/webpages.png
deleted file mode 100644
index 72a091831..000000000
--- a/app/webpages.png
+++ /dev/null
diff --git a/app/wiki.apd b/app/wiki.apd
index e2fbe77e1..d59bdd8a4 100644
--- a/app/wiki.apd
+++ b/app/wiki.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/wiki/$nick
 requires: local_channel
 name: Wiki
 photo: icon:pencil-square-o
 categories: nav_featured_app, Productivity
+desc: A simple yet powerful wiki for your channel.
diff --git a/app/wiki.png b/app/wiki.png
deleted file mode 100644
index 31d981679..000000000
--- a/app/wiki.png
+++ /dev/null