Merge branch 'dev' into nomadic

This commit is contained in:
Mike Macgirvin 2024-05-01 20:34:50 +10:00
commit d8a8b6d433
4 changed files with 1550 additions and 1533 deletions

View file

@ -188,7 +188,9 @@ function get_all_perms($uid, $observer_xchan, $default_ignored = true)
if ($perm_name === 'deliver_stream') {
$ret[$perm_name] = true;
}
$ret[$perm_name] = false;
else {
$ret[$perm_name] = false;
}
continue;
}

File diff suppressed because it is too large Load diff

View file

@ -1,2 +1,2 @@
<?php
define ('STD_VERSION', '24.04.22');
define ('STD_VERSION', '24.05.01');

View file

@ -379,6 +379,13 @@ let postSaveTimer = null;
});
}
function blockproj(project) {
$.get('superblock?f=&blockproj=' + project, function(data) {
location.reload(true);
});
}
function jotGetExpiry() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());