Commit graph

272 commits

Author SHA1 Message Date
witzig
633463108e Merge tag reference abstraction/partial
Perhaps helpers.js would be a more suitable place for
getDefaultMergeTags() and getListMergeTags() … ?
2017-03-04 18:37:41 +01:00
witzig
9f191bd7da Update archive.js
Ups.
2017-03-02 22:49:28 +01:00
witzig
fa9a3de863 Update editor-bridge.hbs 2017-03-02 21:53:07 +01:00
witzig
a11d95f3d7 Support for custom HTML editors 2017-03-02 19:30:40 +01:00
Andris Reinman
78d262ac8d Merge branch 'master' of github.com:andris9/mailtrain 2017-03-02 15:31:30 +02:00
Andris Reinman
45ce56e7c9 v1.22.0 2017-03-02 15:31:06 +02:00
Andris Reinman
500ef03aae Update install.sh 2017-02-26 08:48:52 +02:00
Andris Reinman
66bfcebd47 added support for ses 2017-02-17 15:56:55 +02:00
Andris Reinman
7fde2a9619 Update mailtrain.service 2017-02-14 10:16:22 +02:00
Andris Reinman
d8a9be05c2 Merge pull request #135 from jachin/issue-133
A fix for issue #133.
2017-02-14 10:08:53 +02:00
Jachin Rupe
79cc7e33df A fix for issue #133. 2017-02-13 20:46:31 -06:00
Andris Reinman
9778c486e9 Allow international formatted dates in CSV imports 2017-02-02 16:47:50 +02:00
Andris Reinman
1513c761bc Merge pull request #131 from djKooks/const_patch
Change certain values to const
2017-02-01 13:57:08 +02:00
Dennis Jung
350e05ab06 Change certain values to const 2017-02-01 14:05:01 +09:00
Andris Reinman
461d88f6f2 Added Wiki link 2017-01-30 09:48:54 +02:00
Andris Reinman
c42c71a308 allow using only text content 2017-01-29 18:36:10 +02:00
Andris Reinman
fa5d2d012d allow using only text content 2017-01-29 18:33:40 +02:00
Andris Reinman
441b121b99 allow using only text content 2017-01-29 18:29:50 +02:00
Andris Reinman
59c7e1dd8b allow using only text content 2017-01-29 18:23:00 +02:00
Andris Reinman
3afb37e169 Merge branch 'master' of github.com:andris9/mailtrain 2016-12-25 18:00:05 +02:00
Andris Reinman
50f6c8d101 Reload mailer config once admin updates Mailtrain settings 2016-12-25 17:59:50 +02:00
Andris Reinman
ef32e851c6 Merge pull request #116 from lightonflux/lightonflux-patch-1
Corrected nginx conf file path
2016-12-15 20:03:09 +02:00
lightonflux
2da0f0beba Corrected nginx conf file path
Corrected nginx conf file path
2016-12-15 18:14:32 +01:00
Andris Reinman
9946f70992 Added SendPulse links 2016-12-13 11:41:40 +02:00
Andris Reinman
65f682bd8f Merge pull request #115 from gramakri/patch-1
Fix typo
2016-12-13 00:30:55 +02:00
Girish Ramakrishnan
0ab0614444 Fix typo 2016-12-12 13:11:35 -08:00
Andris Reinman
efe65ffc3c Treat on,y Permanent bounces as hard bounces, skip everything else (eg autorseponders) 2016-12-12 21:45:53 +02:00
Andris Reinman
b35be19824 updated setup script 2016-12-11 00:49:26 +02:00
Andris Reinman
8ca1fbb535 Added option to spawn multiple sender processes 2016-12-11 00:38:54 +02:00
Andris Reinman
88fe24a709 Spawn sender into separate process 2016-12-10 15:27:52 +02:00
Andris Reinman
37b0ac9aec Do not use array.includes to support some older versions of node 2016-12-08 13:49:31 +02:00
Andris Reinman
005941731b Bumped dependencies 2016-12-08 12:15:33 +02:00
Andris Reinman
170b60f9a0 Added option to set default options for nodemailer 2016-12-07 21:39:36 +02:00
Andris Reinman
57c6e0ae79 check if the new address is not already used 2016-12-07 16:21:22 +02:00
Andris Reinman
7fce6e28fa Allow updating subscribers email address 2016-12-07 16:12:26 +02:00
Andris Reinman
8db3672a28 Merge pull request #110 from cloudron-io/master
Add support for reply-to field
2016-12-07 15:17:13 +02:00
Andris Reinman
9ec7f55028 Merge branch 'master' of github.com:andris9/mailtrain 2016-12-07 15:15:45 +02:00
Johannes Zellner
9d7c686f20 Ensure the 'address' label fits the layout 2016-11-25 18:37:19 +01:00
Johannes Zellner
bdd0d6b491 Pass replyTo together with the mail data 2016-11-25 18:11:27 +01:00
Johannes Zellner
385dca65c8 Add form field for replyTo email in campaign edit 2016-11-25 17:44:16 +01:00
Johannes Zellner
e756e315e8 Add form field for replyTo email in campaign creation 2016-11-25 17:44:06 +01:00
Johannes Zellner
ac72abd993 Ensure replyTo is picked up for campaign creation page 2016-11-25 17:43:38 +01:00
Johannes Zellner
15613ba50c Show replyTo address in campaign view 2016-11-25 17:41:32 +01:00
Johannes Zellner
901591dde4 Ensure the campaigns model picks up reply_to 2016-11-25 17:10:44 +01:00
Johannes Zellner
9729246a4c Add reply_to field to campaigns table 2016-11-25 17:10:19 +01:00
Andris Reinman
e8305a3e55 fix 2016-11-16 16:07:01 +02:00
Andris Reinman
19e5530a18 Allow listening on selected interfaces 2016-11-16 15:59:20 +02:00
Andris Reinman
e1d725d786 Update mailtrain.service 2016-11-16 09:25:44 +02:00
Andris Reinman
3e272ebe57 Merge branch 'master' of github.com:andris9/mailtrain into pro 2016-11-13 13:52:06 +02:00
Andris Reinman
8d2e5f23e6 fixed campaign error 2016-11-13 13:50:51 +02:00