Merge pull request #590 from encyclomundi/dev

Minor Change: add Guest Access Token permission option.
This commit is contained in:
zotlabs 2016-11-18 05:54:46 +11:00 committed by GitHub
commit ed7e715812
4 changed files with 5 additions and 1 deletions

View File

@ -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

View File

@ -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>

View File

@ -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.

View File

@ -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:]