Skip to content
This repository was archived by the owner on Nov 28, 2022. It is now read-only.

🎨 support config mail domain setting #1432

Closed
wants to merge 2 commits into from
Closed

🎨 support config mail domain setting #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cb7536
🎨 support config mail domain setting
Jordan-Hall Dec 19, 2019
837d3a0
Merge branch 'master' into email-config-domain
Jordan-Hall Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/components/gh-members-lab-setting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export default Component.extend({
config: service(),
mediaQueries: service(),

mailDomain: computed.or('config.mail.domain', 'blogDomain'),

mailgunRegion: computed('settings.bulkEmailSettings.baseUrl', function () {
if (!this.settings.get('bulkEmailSettings.baseUrl')) {
return US;
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/gh-members-lab-setting.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
input=(action "setSubscriptionSettings" "fromAddress")
class="w20"
}}
<span class="gh-input-append"> @{{this.blogDomain}}</span>
<span class="gh-input-append"> @{{this.mailDomain}}</span>
</div>
<div class="f8 fw4 midgrey mt1">Your members will receive system emails from this address</div>
{{/gh-form-group}}
Expand Down