Commit graph

99 commits

Author SHA1 Message Date
Andris Reinman
020a77c78f applied some code style changes 2017-03-10 14:14:38 +02:00
witzig
588eed008b GrapeJS and Mosaico Integration 2017-03-10 09:59:25 +01:00
Andris Reinman
ab6ed1e505 Ensure ordering for custom fields 2017-03-08 19:07:51 +02:00
Andris Reinman
37531f2550 Merge branch 'master' of github.com:andris9/mailtrain 2017-03-07 16:31:34 +02:00
Andris Reinman
d25565b6f8 Updated translation support 2017-03-07 16:30:56 +02:00
witzig
a164a7fb40 Moved tracking scripts to partial and made tools.formatMessage() less greedy
The change in tools.formatMessage() prevents stripping CSS like
a[data-foo] and arrays in JS. Thus only replacing mergeTag it knows
about.
2017-03-06 14:52:22 +01:00
witzig
28c08cf847 Update helpers.js 2017-03-04 22:04:13 +01:00
witzig
8fdb2840c4 Moved Merge Tag Helpers to helpers.js
… to satisfy ESLint top-level module scope.
2017-03-04 21:50:44 +01:00
witzig
d9c1d8e595 Merge remote-tracking branch 'upstream/master' 2017-03-04 18:38:44 +01:00
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
Andris Reinman
ba8bd12123 initial translations support 2017-03-04 18:15:16 +02:00
witzig
a11d95f3d7 Support for custom HTML editors 2017-03-02 19:30:40 +01:00
Andris Reinman
66bfcebd47 added support for ses 2017-02-17 15:56:55 +02:00
Andris Reinman
9778c486e9 Allow international formatted dates in CSV imports 2017-02-02 16:47:50 +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
50f6c8d101 Reload mailer config once admin updates Mailtrain settings 2016-12-25 17:59:50 +02:00
Andris Reinman
8ca1fbb535 Added option to spawn multiple sender processes 2016-12-11 00:38:54 +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
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
Johannes Zellner
901591dde4 Ensure the campaigns model picks up reply_to 2016-11-25 17:10:44 +01:00
Andris Reinman
8d2e5f23e6 fixed campaign error 2016-11-13 13:50:51 +02:00
Andris Reinman
bd20e16d73 v1.19.1 2016-09-15 10:06:19 +03:00
Andris Reinman
0896e9f9cf v1.19.0 2016-09-15 09:57:19 +03:00
Andris Reinman
35bce32529 Full support for message attachments 2016-09-09 23:09:04 +03:00
Andris Reinman
bfc6983c93 Added attachments to campaigns 2016-09-09 22:12:03 +03:00
Andris Reinman
89715c56fc Merge branch 'master' of github.com:andris9/mailtrain 2016-09-09 13:55:47 +03:00
Andris Reinman
8e5279189a fixed key conversion function 2016-09-09 13:54:44 +03:00
Andris Reinman
e1ace459cf Require subscribers to have JavaScript turned on 2016-09-08 20:43:02 +03:00
Andris Reinman
83ac907f24 Require JavaScript to be turned on for subsciption confirmations 2016-09-08 17:51:39 +03:00
Andris Reinman
78083c33fd Require JavaScript to be turned on for subsciption confirmations 2016-09-08 17:49:01 +03:00
Andris Reinman
d651cca039 Updated installation script 2016-09-08 15:31:38 +03:00
Andris Reinman
95379f731f v1.18.0 2016-09-08 14:39:41 +03:00
Andris Reinman
d2f0d16980 Updated install script to bundle ZoneMTA 2016-09-08 11:20:33 +03:00
Andris Reinman
69ff628cda Added support for JSON 2016-08-29 15:51:20 +03:00
Andris Reinman
35078defb6 do not fail on custom field index error 2016-08-29 14:53:39 +03:00
Andris Reinman
7cb5af94b0 return tag 2016-08-29 14:09:07 +03:00
Andris Reinman
c1cf51e877 Return id for field insert api call 2016-08-29 14:03:49 +03:00
Andris Reinman
896fc01015 v1.16.0 2016-08-29 13:57:27 +03:00
Andris Reinman
3fcd389db8 Merge branch 'cloudron-io-master' 2016-08-29 13:02:20 +03:00
Andris Reinman
1469e08063 Added API call to create new custom fields 2016-08-29 12:27:14 +03:00
Johannes Zellner
2c387351c6 Deny access for empty password authentication attempts 2016-08-11 14:46:52 +02:00
Johannes Zellner
4f3b2e9dcb Add ldap authentication 2016-08-11 13:21:48 +02:00
Johannes Zellner
3f86ad2945 Add users.add() 2016-08-11 13:15:51 +02:00
Johannes Zellner
dff9996fda Add users.findByUsername() 2016-08-11 13:01:02 +02:00
Andris Reinman
ef4aa301ab do not decrement new unsubscribed subscribers, fixes #83 2016-08-11 10:56:16 +03:00
Andris Reinman
fb7fd7238f Encode List-ID header, allow access to campaigns with deleted list 2016-08-10 20:45:29 +03:00
Paul Borza
5a52eeaf3a add tracking image 2016-07-31 20:02:36 +03:00