Merge branch 'dev' of https://framagit.org/hubzilla/core into dev

27 files changed, 53 insertions, 27 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/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..db453d6f1 100644
--- a/app/channel.apd
+++ b/app/channel.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/channel/$nick, $baseurl/settings/channel_home
 requires: local_channel
 name: Channel Home
 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/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/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/group.apd b/app/group.apd
index da0b31407..d026ed23d 100644
--- a/app/group.apd
+++ b/app/group.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/group
 requires: local_channel
 name: Privacy Groups
 photo: icon:users
 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/hq.apd b/app/hq.apd
index b9e9f806f..07f82653f 100644
--- a/app/hq.apd
+++ b/app/hq.apd
@@ -1,6 +1,7 @@
-version: 1
+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/lang.apd b/app/lang.apd
index 1856336ef..27e2d7c84 100644
--- a/app/lang.apd
+++ b/app/lang.apd
@@ -1,5 +1,6 @@
-version: 5.6
+version: 3
 url: $baseurl/lang
 name: Language
 photo: icon:language
 categories: System
+desc: A simple language selector.
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/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.apd
index fbc643296..e13c04cb5 100644
--- a/app/pdledit.apd
+++ b/app/pdledit.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/pdledit
 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..dd7b36b92 100644
--- a/app/permcats.apd
+++ b/app/permcats.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/permcats
 requires: local_channel
 name: Permission Categories
 photo: icon:unlock-alt
 categories: Access Control
+desc: Create and manage custom connection permission limits.
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/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/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.