public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
1281 commits 9 branches 34 tags 30 MiB
Commit graph

1281 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adrian Woeltche
d6f7f9a055 grapejs update 2018-07-11 15:50:02 +02:00
humancopy
e0a5d356a2 Add != to formatted rule to show that it's negated 2018-07-02 15:35:37 +02:00
humancopy
ceba65a098 Add the possibility to create a negated rule on segments 2018-07-02 14:26:59 +02:00
Adrian Woeltche
abd788d8f4 optional ca and dhparams 2018-06-21 16:45:18 +02:00
Adrian Woeltche
4501f71dd8 permit https 2018-06-21 16:41:45 +02:00
Adrian Woeltche
fe6152ea31 added ca options 2018-06-21 15:58:46 +02:00
Adrian Woeltche
5325f2ea78 ldap change to url for making it possible to use ldaps:// too 2018-06-21 15:15:44 +02:00
Erik Anders
3b695bed35 add missing translations 2018-06-15 09:41:14 +02:00
Tomas Bures
206e7a5b52
Merge pull request #434 from njam/disable-listunsubscribe 
Add option on list to disable "List-Unsubscribe" header
 2018-06-13 12:48:20 +02:00
Reto Kaiser
16ce44146f Add option on list to disable "List-Unsubscribe" header 2018-06-13 09:53:29 +02:00
Tomas Bures
fc5fc5b09c
Merge pull request #436 from njam/fix-build 
Fix build
 2018-06-12 13:10:09 +02:00
Reto Kaiser
133eb68325 Change email domain in tests to "gmail.com" 
The domain needs to have an MX record associated, and mailtrain.org doesn't have one (anymore).
 2018-05-29 15:37:05 +02:00
Reto Kaiser
06ee230e33 Fix eslint warnings 2018-05-29 15:15:49 +02:00
Wes Garrison
48ecc9b47c
Fix newsletter signup link in README 2018-05-23 11:33:08 -05:00
Tomas Bures
4943b22a51 Subscription tests now pass. 2018-05-21 19:41:10 +02:00
Tomas Bures
b74c4d9438
Merge pull request #421 from gsiou/master 
API functionality: get all lists, get list by id
 2018-05-21 06:03:46 -07:00
Tomas Bures
076d746b32
Merge pull request #415 from mauricemeyer/master 
Updated some german translations
 2018-05-21 06:02:53 -07:00
Tomas Bures
3d339cd674
Merge pull request #413 from dougal/fix-spelling-lose-password 
Fix spelling in email field help block.
 2018-05-21 06:02:01 -07:00
Tomas Bures
1f5566ca9b Some fixes so that the subscription forms work with the new mailer 2018-05-20 20:27:35 +02:00
Georgios Anastasiou
60adfed0a6 API: get list by id 2018-05-16 12:43:36 +03:00
Georgios Anastasiou
5f18c9d44f API: get all lists 2018-05-16 12:15:45 +03:00
Tomas Bures
446d75ce71 Support for custom block thumbnails in Mosaico templates 2018-05-13 22:40:34 +02:00
Tomas Bures
7788b0bc67 Fixed sandbox. Multiple tabs work now. 
WiP on selectable mosaico templates.

TODO: Make files always point to trusted URL, such that we don't have to rebase them. They are public anyway. The same goes for mosaico endpoints: /mosaico/templates and /mosaico/img
 2018-05-09 04:07:01 +02:00
Tomas Bures
a4ee1534cc WiP on mailers 2018-04-29 18:13:40 +02:00
Maurice Meyer
61f3f4069c
Merge remote-tracking branch 'upstream/master' 2018-04-28 16:06:12 +02:00
Douglas F Shearer
549cc70c4f Fix spelling in email field help block. 2018-04-26 13:20:41 +01:00
Jonas Düver
80f2fe1b26 Bump version 2018-04-25 18:18:36 +02:00
Jonas Düver
52f4213cb7 Add segment support to triggers model and database 2018-04-25 18:16:51 +02:00
Jonas Düver
006e4aa116 Add segment support to triggers frontend 2018-04-25 18:15:14 +02:00
Tomas Bures
e97415c237 Some bugfixes. The configuration management should be now OK. 2018-04-22 20:29:35 +02:00
Tomas Bures
c12efeb97f Configuration split to lists, send configurations and server config. 
This is before testing.
 2018-04-22 17:33:43 +02:00
Tomas Bures
4fce4b6f81 WiP updates 2018-04-22 09:00:04 +02:00
Tomas Bures
ae7a8eb72d
Merge pull request #407 from davidfurlong/master 
Update README.md
 2018-04-14 07:36:38 +02:00
Tomas Bures
39ef4c1119
Merge pull request #402 from rrooij/translation_fix 
Fix translations typo and double message
 2018-04-14 07:35:57 +02:00
Tomas Bures
f6892a8ca4
Merge pull request #408 from giorgioma/master 
[LANG] 94% Italian language translation - left some techy strings
 2018-04-14 07:34:57 +02:00
giorgioma
376afdf9ae Typo fix 2018-04-11 12:43:32 +02:00
giorgioma
288eebdbcd [LANG] 94% Italian language translation - left some techy strings 2018-04-10 16:33:54 +02:00
David Furlong
d0d76f69ca
Update README.md 2018-04-10 13:59:29 +02:00
Tomas Bures
6706d93bc1 Basic support for Mosaico templates. 
TODO:
- Allow choosing a mosaico template in a mosaico-based template
- Integrate the custom mosaico templates with templates (endpoint for retrieving a mosaico template, replacement of URL_BASE and PLACEHOLDER tags
- Implement support for MJML-based Mosaico templates
- Implement support for MJML-based templates
- Implement support for GrapeJS-based templates
 2018-04-02 19:05:22 +02:00
Tomas Bures
7b5642e911 Basic support for Mosaico-based email templates. 2018-04-02 11:58:32 +02:00
Tomas Bures
b5cdf57f72 Files can be added to templates and managed in a dedicated "Files" view. 
Mosaico integration in progress. The files seem to be working for Mosaico.
 2018-03-24 23:55:50 +01:00
rrooij
465fa3a739 Fix translations typo and double message 
The Spanish error about the missing message ID appeared twice and
generated an error when converting the translation file.

Another fix is the typos that were still present in the msgid's.
 2018-03-24 13:37:19 +01:00
Tomas Bures
d83ec23629
Merge pull request #401 from rrooij/typofix 
Subscriptions: fix error typo
 2018-03-24 09:31:20 +01:00
rrooij
a9054b30dd Subscriptions: fix error typo 2018-03-23 19:53:28 +01:00
Maurice Meyer
73f12050bc
Fixed more of the translation 
Signed-off-by: Maurice Meyer <morre@mor.re>
 2018-03-07 14:13:00 +01:00
Maurice Meyer
62f2b6a2d8
Fixed some more minor translation errors 
Signed-off-by: Maurice Meyer <morre@mor.re>
 2018-03-07 14:10:16 +01:00
Maurice Meyer
d7a9731d80
Improved German translation 
Signed-off-by: Maurice Meyer <morre@mor.re>
 2018-03-06 16:34:31 +01:00
Gerard Krol (Zermelo)
5ee8347115
Merge pull request #393 from mauricemeyer/master 
Fixed typos and superfluous spaces in the German translation
 2018-03-06 14:58:44 +01:00
Maurice Meyer
9ae21f7550
Fixed typos and superfluous spaces 
Signed-off-by: Maurice Meyer <morre@mor.re>
 2018-03-06 14:51:49 +01:00
Tomas Bures
c85f2d4440 Obsoleting some old files 
Transition to SPA-style client
Basis for Mosaico template editor
 2018-02-25 20:54:15 +01:00