Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 00:35:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename hyperdrive setting, add acl patches from upstream

Browse source
This commit is contained in:
zotlabs 2019-10-08 16:48:46 -07:00
parent b96b1c8580
commit dbf2541aac
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Zotlabs/Module/Settings/Channel.php
View file

@ -512,7 +512,7 @@ class Channel {
$autoperms = '<input type="hidden" name="autoperms" value="' . intval(get_pconfig(local_channel(),'system','autoperms')) . '" />';
}
$hyperdrive = [ 'hyperdrive', t('Enable hyperdrive'), ((get_pconfig(local_channel(),'system','hyperdrive',true)) ? 1 : 0), t('Import public third-party conversations in which your connections participate.'), $yes_no ];
$hyperdrive = [ 'hyperdrive', t('Friend-of-friend conversations'), ((get_pconfig(local_channel(),'system','hyperdrive',true)) ? 1 : 0), t('Import public third-party conversations in which your connections participate.'), $yes_no ];
if (get_config('system','activitypub')) {
$apconfig = true;

10
view/js/acl.js
View file

@ -207,7 +207,7 @@ ACL.prototype.on_button_hide = function(event) {
ACL.prototype.set_allow = function(itemid) {
type = itemid[0];
id = itemid.substr(1);
id = decodeURIComponent(itemid.substr(1));
switch(type) {
case "g":
if (that.allow_gid.indexOf(id)<0) {
@ -231,7 +231,7 @@ ACL.prototype.set_allow = function(itemid) {
ACL.prototype.set_deny = function(itemid) {
type = itemid[0];
id = itemid.substr(1);
id = decodeURIComponent(itemid.substr(1));
switch(type) {
case "g":
if (that.deny_gid.indexOf(id)<0) {
@ -310,8 +310,12 @@ ACL.prototype.update_view = function(value) {
else {
that.list.show(); //show acl-list
datasrc2src('#acl-list-content .list-group-item img[data-src]');
that.info.hide(); //hide acl-info
that.update_select('custom');
if(typeof value === 'undefined') {
value = 'custom';
}
/* jot acl */
if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'custom') {
@ -334,7 +338,7 @@ ACL.prototype.update_view = function(value) {
$("#acl-list-content .acl-list-item").each(function() {
itemid = $(this).attr('id');
type = itemid[0];
id = itemid.substr(1);
id = decodeURIComponent(itemid.substr(1));
btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-outline-success");
bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-outline-danger");