diff options
| author | zotlabs <mike@macgirvin.com> | 2016-11-18 05:54:46 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 05:54:46 +1100 |
| commit | ed7e7158122dd1d9740afa51bdfef3aac788d401 (patch) | |
| tree | 6b9d81cc68ff67280b458194128758279ed014b4 | |
| parent | 0b0e0f8f43fc199e0b45a15cc2bc1bd228b58ba9 (diff) | |
| parent | 4d12af8396b95e50e253fd077c996349da9d64f4 (diff) | |
| download | volse-hubzilla-ed7e7158122dd1d9740afa51bdfef3aac788d401.tar.gz volse-hubzilla-ed7e7158122dd1d9740afa51bdfef3aac788d401.tar.bz2 volse-hubzilla-ed7e7158122dd1d9740afa51bdfef3aac788d401.zip | |
Merge pull request #590 from encyclomundi/dev
Minor Change: add Guest Access Token permission option.
| -rw-r--r-- | doc/addons.bb | 2 | ||||
| -rw-r--r-- | doc/bbcode.html | 1 | ||||
| -rw-r--r-- | doc/features.bb | 1 | ||||
| -rw-r--r-- | doc/permissions.bb | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/doc/addons.bb b/doc/addons.bb index 9927a2956..6fa9510f5 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -49,7 +49,7 @@ [*] nsabait - add random terrorism related hashtags to your posts [*] nsfw - Highly recommended plugin to collpase posts with inappropriate content [*] openclipatar - choose a profile photo from hundreds of royalty free images -[*] openid - OpenID authentication and OpenID server +[*] openid - OpenID authentication and OpenID server. Your OpenID URL is [observer.baseurl]/id/[observer.webname] [*] openstreetmap - render locations and maps using OpenStreetMap [*] pageheader - display text at the top of every page on the site [*] phpmailer - alternate mail delivery system with more configurability diff --git a/doc/bbcode.html b/doc/bbcode.html index 7a2c969eb..36f40d3f4 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -78,6 +78,7 @@ or<br /><br />[dl terms="b"]<br />[*= First element term] First element descript <li>[observer.baseurl] website of observer</li> <li>[observer.url] channel URL of observer</li> <li>[observer.name] name of observer</li> +<li>[observer.webname] short name in the url of the observer</li> <li>[observer.address] address (zot-id) of observer</li> <li>[observer.photo] profile photo of observer<br /></li> diff --git a/doc/features.bb b/doc/features.bb index 3daf403c3..578af6050 100644 --- a/doc/features.bb +++ b/doc/features.bb @@ -134,6 +134,7 @@ The options are: - Anybody on this website.
- Anybody in this network.
- Anybody authenticated.
+ - Specific people you provide a Guest Access Token to in order to access a specific item.
- Anybody on the Internet.
diff --git a/doc/permissions.bb b/doc/permissions.bb index 0721c763d..64690d608 100644 --- a/doc/permissions.bb +++ b/doc/permissions.bb @@ -32,6 +32,8 @@ We highly recommend that you use the "typical social network" settings when you [*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore [i]may[/i] include visitors from other networks.
+ [*=Guest Access Token] This allows you to share a file, folder, photo, album, or channel with a specific person or group of people. They don't need to be Hubzilla members. You can set an expiration for the Access Token.
+
[*= Anybody on the internet ] Completely public. This permission will be approved for anybody at all.
[/dl]
[*= The individual permissions are:]
|