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

This commit is contained in:
zotlabs 2017-05-10 17:11:17 -07:00
commit 08e21fd0b8
5 changed files with 11984 additions and 12501 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="section-title-wrapper clearfix">
{{if $is_owner}}
<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('chatroom-new');" data-form_id="chatroom-new-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$newroom}}</button>
{{/if}}

View File

@ -1,5 +1,5 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="section-title-wrapper clearfix">
{{if $authed}}
{{if $create}}
<a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i>&nbsp;{{$create}}</a>

View File

@ -1,5 +1,5 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="section-title-wrapper clearfix">
{{if $owner}}
<button type="button" class="btn btn-success btn-sm pull-right acl-form-trigger" onclick="openClose('new-wiki-form-wrapper');" data-form_id="new-wiki-form"><i class="fa fa-plus-circle"></i>&nbsp;{{$create}}</button>
{{/if}}