public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access

Browse source 
Conflicts:
	views/users/api.hbs
This commit is contained in:
Tomas Bures 2017-07-09 23:34:03 +02:00
commit ad1e4c58f5
21 changed files with 5088 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

9
views/blacklist.hbs
View file

@ -8,10 +8,13 @@
<form class="form-horizontal" method="post" action="/blacklist/ajax/add">
<input type="hidden" name="_csrf" value="{{csrfToken}}">
<input type="hidden" name="next" value="/blacklist">
<div class="col-sm-4">
<input type="text" class="form-control input-md" name="email" id="add-email-input" value="" placeholder="{{#translate}}Add email to blacklist{{/translate}}">
<div class="form-group">
<div class="col-sm-4 col-xs-8">
<input type="text" class="form-control input-md" name="email" id="add-email-input" value="" placeholder="{{#translate}}Add email to blacklist{{/translate}}">
</div>
<button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>{{#translate}}Add{{/translate}}</button>
</div>
<button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>{{#translate}}Add{{/translate}}</button>
<p class="help-block">A blacklisted email address will not receive messages from any campaign. The blacklist does not apply to transactional messages.</p>
</form>
<form class="form-horizontal" id="delete-email-form" method="post" action="/blacklist/ajax/delete">