jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove use of config.fqdn

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-01-29 14:35:47 -08:00
parent f850235b3a
commit f3b53a22f5
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webadmin/src/views/users.html
View File

@@ -293,8 +293,8 @@
</div>
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="col-lg-12">
<span ng-show="mailConfig.enabled">
Each user has a mailbox at <b><i>username</i>@{{ config.fqdn }}</b>.
<span>
For email enabled domains, each user has a mailbox at <b><i>username@domain</i></b>.
Please refer to the <a ng-href="{{ config.webServerOrigin + '/documentation/email/#imap-settings-for-cloudron-email' }}" target="_blank">user documentation</a> on how to use Cloudron email accounts.
<br/>
<br/>
@@ -314,7 +314,7 @@
<i class="fa fa-briefcase arrow" ng-show="user.admin" uib-tooltip="This user is an admin and can manage apps, groups and other users"></i>
</td>
<td class="hand elide-table-cell" ng-click="useredit.show(user)" ng-show="user.username">
{{ user.username }} &nbsp; <span class="text-muted" ng-hide="mailConfig.enabled">{{ user.email }}</span>
{{ user.username }} &nbsp; <span class="text-muted">{{ user.email }}</span>
</td>
<td class="hand elide-table-cell" ng-click="useredit.show(user)" ng-hide="user.username">
<span class="text-muted" uib-tooltip="User is not activated yet">{{ user.fallbackEmail }}</span>
@@ -354,8 +354,7 @@
</div>
<div class="row animateMeOpacity ng-hide" ng-show="ready">
<div class="col-lg-12">
Groups can be used to control access to an app.
<span ng-show="mailConfig.enabled">Each group serves as an email list at <b><i>groupname</i>@{{ config.fqdn }}</b>. Any email sent to this address will be forwarded to each group member.</span>
Groups can be used to control access to an app. When Cloudron email is enabled, each group also serves as an email list at <b><i>groupname@domain</i></b>. Any email sent to this address will be forwarded to each group member.</span>
<br/>
<br/>
<table class="table table-hover">