harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs 2018-05-21 21:15:24 -07:00
commit 76d8e59e9b
10 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Channel.php
View File

@ -152,7 +152,8 @@ class Channel extends \Zotlabs\Web\Controller {
'editor_autocomplete' => true, 'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode', 'bbco_autocomplete' => 'bbcode',
'bbcode' => true, 'bbcode' => true,
'jotnets' => true 'jotnets' => true,
'reset' => t('Reset form')
); );
$o .= status_editor($a,$x); $o .= status_editor($a,$x);

6
Zotlabs/Module/Display.php
View File

@ -67,8 +67,7 @@ class Display extends \Zotlabs\Web\Controller {
'default_location' => $channel['channel_location'], 'default_location' => $channel['channel_location'],
'nickname' => $channel['channel_address'], 'nickname' => $channel['channel_address'],
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
'acl' => populate_acl($channel_acl),
'permissions' => $channel_acl, 'permissions' => $channel_acl,
'bang' => '', 'bang' => '',
'visitor' => true, 'visitor' => true,
@ -78,7 +77,8 @@ class Display extends \Zotlabs\Web\Controller {
'editor_autocomplete' => true, 'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode', 'bbco_autocomplete' => 'bbcode',
'bbcode' => true, 'bbcode' => true,
'jotnets' => true 'jotnets' => true,
'reset' => t('Reset form')
); );
$o = '<div id="jot-popup">'; $o = '<div id="jot-popup">';

6
Zotlabs/Module/Hq.php
View File

@ -120,8 +120,7 @@ class Hq extends \Zotlabs\Web\Controller {
'default_location' => $channel['channel_location'], 'default_location' => $channel['channel_location'],
'nickname' => $channel['channel_address'], 'nickname' => $channel['channel_address'],
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
'acl' => populate_acl($channel_acl),
'permissions' => $channel_acl, 'permissions' => $channel_acl,
'bang' => '', 'bang' => '',
'visitor' => true, 'visitor' => true,
@ -131,7 +130,8 @@ class Hq extends \Zotlabs\Web\Controller {
'editor_autocomplete' => true, 'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode', 'bbco_autocomplete' => 'bbcode',
'bbcode' => true, 'bbcode' => true,
'jotnets' => true 'jotnets' => true,
'reset' => t('Reset form')
]; ];
$o = replace_macros(get_markup_template("hq.tpl"), $o = replace_macros(get_markup_template("hq.tpl"),

6
Zotlabs/Module/Pubstream.php
View File

@ -66,8 +66,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
'default_location' => $channel['channel_location'], 'default_location' => $channel['channel_location'],
'nickname' => $channel['channel_address'], 'nickname' => $channel['channel_address'],
'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'acl' => populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
'acl' => populate_acl($channel_acl),
'permissions' => $channel_acl, 'permissions' => $channel_acl,
'bang' => '', 'bang' => '',
'visitor' => true, 'visitor' => true,
@ -77,7 +76,8 @@ class Pubstream extends \Zotlabs\Web\Controller {
'editor_autocomplete' => true, 'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode', 'bbco_autocomplete' => 'bbcode',
'bbcode' => true, 'bbcode' => true,
'jotnets' => true 'jotnets' => true,
'reset' => t('Reset form')
); );
$o = '<div id="jot-popup">'; $o = '<div id="jot-popup">';

4
util/add_addon_repo
View File

@ -1,4 +1,6 @@
#!/usr/bin/env bash -f #!/usr/bin/env bash
set -f
if [ $# -lt 2 ]; then if [ $# -lt 2 ]; then
echo usage: $0 repo_url nickname echo usage: $0 repo_url nickname

4
util/add_theme_repo
View File

@ -1,4 +1,6 @@
#!/usr/bin/env bash -f #!/usr/bin/env bash
set -f
if [ $# -lt 2 ]; then if [ $# -lt 2 ]; then
echo usage: $0 repo_url nickname echo usage: $0 repo_url nickname

4
util/add_widget_repo
View File

@ -1,4 +1,6 @@
#!/usr/bin/env bash -f #!/usr/bin/env bash
set -f
if [ $# -lt 2 ]; then if [ $# -lt 2 ]; then
echo usage: $0 repo_url nickname echo usage: $0 repo_url nickname

4
util/update_addon_repo
View File

@ -1,4 +1,6 @@
#!/usr/bin/env bash -f #!/usr/bin/env bash
set -f
if [ $# -ne 1 ]; then if [ $# -ne 1 ]; then
echo usage: $0 repository echo usage: $0 repository

4
util/update_theme_repo
View File

@ -1,4 +1,6 @@
#!/usr/bin/env bash -f #!/usr/bin/env bash
set -f
if [ $# -ne 1 ]; then if [ $# -ne 1 ]; then

4
util/update_widget_repo
View File

@ -1,4 +1,6 @@
#!/usr/bin/env bash -f #!/usr/bin/env bash
set -f
if [ $# -ne 1 ]; then if [ $# -ne 1 ]; then
echo usage: $0 repository echo usage: $0 repository