Commit graph

300 commits

Author SHA1 Message Date
Amit Kumar
2056ec4a56 Add List-Unsubscribe header 2017-03-08 22:55:16 +05:30
Andris Reinman
96292bfe05 Merge pull request #162 from Minimalistic/patch-1
Addition of Table of Contents with relative links
2017-03-08 18:21:32 +02:00
Jason Marsh
2c74d7044a Addition of Table of Contents 2017-03-08 10:04:27 -06:00
Andris Reinman
63ae26a0a7 Merge pull request #153 from witzig/move-wallet
Moved Bitcoin wallet out of mailtrain.pot
2017-03-08 06:25:04 +02:00
Andris Reinman
9332f2b60b Merge pull request #155 from heroic/master
Fixes #154
2017-03-08 06:24:09 +02:00
Amit Kumar
8863d67679 Merge pull request #1 from heroic/fixBrokenTag
Fix broken tag
2017-03-08 09:47:54 +05:30
Amit Kumar
6174fe9c83 Fix broken tag 2017-03-08 09:47:11 +05:30
witzig
97d758b039 Moved Bitcoin wallet out of translation 2017-03-07 20:59:09 +01:00
Andris Reinman
37531f2550 Merge branch 'master' of github.com:andris9/mailtrain 2017-03-07 16:31:34 +02:00
Andris Reinman
5d7e3b69fb Merge pull request #150 from witzig/tracking-code-partial
Moved tracking scripts to partial and made tools.formatMessage() less…
2017-03-07 16:31:19 +02:00
Andris Reinman
573a6d44ff Merge pull request #149 from witzig/master
Temporary fix for #148
2017-03-07 16:31:12 +02:00
Andris Reinman
d25565b6f8 Updated translation support 2017-03-07 16:30:56 +02:00
Andris Reinman
b1e8cd68cd Merge branch 'master' of github.com:andris9/mailtrain 2017-03-07 11:43: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
Andris Reinman
89f480d5f8 fixed dependencies 2017-03-06 10:48:08 +02:00
witzig
4c2f3a548c Temporary fix for #148 2017-03-05 01:54:09 +01:00
Andris Reinman
1c38a1a7bb Merge pull request #147 from witzig/master
Moved Merge Tag Helpers to helpers.js
2017-03-04 23:34:36 +02:00
witzig
28c08cf847 Update helpers.js 2017-03-04 22:04:13 +01:00
witzig
66dc1091a8 Merge remote-tracking branch 'upstream/master' 2017-03-04 21:52:10 +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
Andris Reinman
bd6ba90eca Added 'created' column for subscribers lists table 2017-03-04 22:02:46 +02:00
Andris Reinman
435de82819 Merge pull request #145 from witzig/master
Merge tag reference abstraction/partial
2017-03-04 21:50:03 +02: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
ae297e4af6 updated readme 2017-03-04 18:22:47 +02:00
Andris Reinman
f5ee05c55e updated readme 2017-03-04 18:21:41 +02:00
Andris Reinman
3232d01b39 updated readme 2017-03-04 18:20:32 +02:00
Andris Reinman
ba8bd12123 initial translations support 2017-03-04 18:15:16 +02:00
Andris Reinman
811d7b51b9 Merge pull request #142 from witzig/master
Support for custom HTML editors
2017-03-04 16:47:15 +02: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