diff options
author | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
commit | fd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (patch) | |
tree | 5c37812ef7baeadc17fce088c4394d25f75b593c /app | |
parent | c993ddd86ee25832e35e65333fa25b396e7aefdf (diff) | |
parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
download | volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.gz volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.bz2 volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.zip |
Merge branch 'master' into pocorate
Diffstat (limited to 'app')
-rw-r--r-- | app/bookmarks.apd | 2 | ||||
-rw-r--r-- | app/channel.apd | 2 | ||||
-rw-r--r-- | app/chat.apd | 2 | ||||
-rw-r--r-- | app/connections.apd | 2 | ||||
-rw-r--r-- | app/events.apd | 2 | ||||
-rw-r--r-- | app/features.apd | 2 | ||||
-rw-r--r-- | app/invite.apd | 2 | ||||
-rw-r--r-- | app/mail.apd | 2 | ||||
-rw-r--r-- | app/manage.apd | 2 | ||||
-rw-r--r-- | app/matrix.apd | 2 | ||||
-rw-r--r-- | app/mood.apd | 2 | ||||
-rw-r--r-- | app/photos.apd | 2 | ||||
-rw-r--r-- | app/poke.apd | 2 | ||||
-rw-r--r-- | app/pphoto.apd | 2 | ||||
-rw-r--r-- | app/probe.apd | 2 | ||||
-rw-r--r-- | app/profile.apd | 2 | ||||
-rw-r--r-- | app/settings.apd | 2 | ||||
-rw-r--r-- | app/storage.apd | 2 | ||||
-rw-r--r-- | app/suggest.apd | 2 | ||||
-rw-r--r-- | app/webpages.apd | 2 |
20 files changed, 20 insertions, 20 deletions
diff --git a/app/bookmarks.apd b/app/bookmarks.apd index 6c3d718a8..9581a220c 100644 --- a/app/bookmarks.apd +++ b/app/bookmarks.apd @@ -1,4 +1,4 @@ url: $baseurl/bookmarks -requires: local_user +requires: local_channel name: View bookmarks photo: $baseurl/app/bookmarks.png diff --git a/app/channel.apd b/app/channel.apd index be13ee77b..0b5400ae4 100644 --- a/app/channel.apd +++ b/app/channel.apd @@ -1,4 +1,4 @@ url: $baseurl/channel/$nick -requires: local_user +requires: local_channel name: Channel Home photo: $baseurl/app/home.png diff --git a/app/chat.apd b/app/chat.apd index 249608f57..d4879c0b7 100644 --- a/app/chat.apd +++ b/app/chat.apd @@ -1,4 +1,4 @@ url: $baseurl/chat/$nick -requires: local_user +requires: local_channel name: My chatrooms photo: $baseurl/app/chat.png diff --git a/app/connections.apd b/app/connections.apd index 146e553e5..f4b5ad87a 100644 --- a/app/connections.apd +++ b/app/connections.apd @@ -1,4 +1,4 @@ url: $baseurl/connections -requires: local_user +requires: local_channel name: Connections photo: $baseurl/app/connections.png diff --git a/app/events.apd b/app/events.apd index 2f43efbe1..dd725e177 100644 --- a/app/events.apd +++ b/app/events.apd @@ -1,4 +1,4 @@ url: $baseurl/events -requires: local_user +requires: local_channel name: Events photo: $baseurl/app/events.png diff --git a/app/features.apd b/app/features.apd index 3d01e841c..521df4794 100644 --- a/app/features.apd +++ b/app/features.apd @@ -1,4 +1,4 @@ url: $baseurl/settings/features -requires: local_user +requires: local_channel name: Features photo: $baseurl/app/features.png diff --git a/app/invite.apd b/app/invite.apd index 8526d2d4a..96bafff14 100644 --- a/app/invite.apd +++ b/app/invite.apd @@ -1,4 +1,4 @@ url: $baseurl/invite -requires: local_user +requires: local_channel name: Invite photo: $baseurl/app/invite.png diff --git a/app/mail.apd b/app/mail.apd index e916829ad..b9fdb9967 100644 --- a/app/mail.apd +++ b/app/mail.apd @@ -1,4 +1,4 @@ url: $baseurl/message -requires: local_user +requires: local_channel name: Mail photo: $baseurl/app/mail.png diff --git a/app/manage.apd b/app/manage.apd index 2e0a92d74..27938e4cf 100644 --- a/app/manage.apd +++ b/app/manage.apd @@ -1,4 +1,4 @@ url: $baseurl/manage -requires: local_user +requires: local_channel name: Channel Manager photo: $baseurl/app/manage.png diff --git a/app/matrix.apd b/app/matrix.apd index 96df48690..68188bfd3 100644 --- a/app/matrix.apd +++ b/app/matrix.apd @@ -1,4 +1,4 @@ url: $baseurl/network -requires: local_user +requires: local_channel name: Matrix photo: $baseurl/app/matrix.png diff --git a/app/mood.apd b/app/mood.apd index ef90650f0..6f381fd44 100644 --- a/app/mood.apd +++ b/app/mood.apd @@ -1,4 +1,4 @@ url: $baseurl/mood -requires: local_user +requires: local_channel name: Mood photo: $baseurl/app/mood.png diff --git a/app/photos.apd b/app/photos.apd index d0a314406..3422d5205 100644 --- a/app/photos.apd +++ b/app/photos.apd @@ -1,4 +1,4 @@ url: $baseurl/photos/$nick -requires: local_user +requires: local_channel name: Photos photo: $baseurl/app/photos.png diff --git a/app/poke.apd b/app/poke.apd index b7d189224..7e3bb4ff0 100644 --- a/app/poke.apd +++ b/app/poke.apd @@ -1,4 +1,4 @@ url: $baseurl/poke -requires: local_user +requires: local_channel name: Poke photo: $baseurl/app/poke.png diff --git a/app/pphoto.apd b/app/pphoto.apd index e7da9cf9c..302b85d9e 100644 --- a/app/pphoto.apd +++ b/app/pphoto.apd @@ -1,4 +1,4 @@ url: $baseurl/profile_photo -requires: local_user +requires: local_channel name: Profile Photo photo: $baseurl/app/pphoto.png diff --git a/app/probe.apd b/app/probe.apd index e2d2428a0..e1ab5fc43 100644 --- a/app/probe.apd +++ b/app/probe.apd @@ -1,4 +1,4 @@ url: $baseurl/probe -requires: local_user +requires: local_channel name: Remote diagnostics photo: $baseurl/app/probe.png diff --git a/app/profile.apd b/app/profile.apd index d2bdf23a7..d353d5742 100644 --- a/app/profile.apd +++ b/app/profile.apd @@ -1,4 +1,4 @@ url: $baseurl/profile/$nick -requires: local_user +requires: local_channel name: View profile photo: $baseurl/app/profile.png diff --git a/app/settings.apd b/app/settings.apd index 311f793ff..fbb5eacdd 100644 --- a/app/settings.apd +++ b/app/settings.apd @@ -1,4 +1,4 @@ url: $baseurl/settings -requires: local_user +requires: local_channel name: Settings photo: $baseurl/app/settings.png diff --git a/app/storage.apd b/app/storage.apd index 5900faae8..c959a3cd4 100644 --- a/app/storage.apd +++ b/app/storage.apd @@ -1,4 +1,4 @@ url: $baseurl/cloud/$nick -requires: local_user +requires: local_channel name: Files photo: $baseurl/app/storage.png diff --git a/app/suggest.apd b/app/suggest.apd index f4ca79410..f3d17e0ea 100644 --- a/app/suggest.apd +++ b/app/suggest.apd @@ -1,4 +1,4 @@ url: $baseurl/suggest -requires: local_user +requires: local_channel name: Suggest channels photo: $baseurl/app/suggest.png diff --git a/app/webpages.apd b/app/webpages.apd index 7c7528d6b..78e7abba8 100644 --- a/app/webpages.apd +++ b/app/webpages.apd @@ -1,4 +1,4 @@ url: $baseurl/webpages/$nick -requires: local_user, webpages +requires: local_channel, webpages name: Webpages photo: $baseurl/app/webpages.png |