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

1052 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adrian Woeltche
396c8f597e another hack 2018-08-02 16:48:46 +02:00
Adrian Woeltche
3217af5720 dirty fix for making test button better working 2018-08-02 16:46:06 +02:00
Tomas Bures
b1c667d13d Merged migrations into one big v1->v2 which is not incremental, thus it does not need code copy-pasting. 
Some fixes.
 2018-08-02 17:05:57 +05:30
Tomas Bures
32cad03f4f Improved files to distinguish subtypes (allows multiple different files tabs at a entity) 
Attachments via the improved files
Block thumbnails at mosaico templates as a separate files tab
Some fixes

All not tested yet
 2018-08-02 15:49:27 +05:30
Tomas Bures
ade0fc87f2 work in progress on campaign edit 2018-08-01 15:30:20 +05:30
Raphael Hittich
0f20c5f6f7 Fix another linter error 2018-08-01 11:12:44 +02:00
Raphael Hittich
a26c75e26c Fix linter error 2018-08-01 11:09:16 +02:00
Raphael Hittich
68cb8384f7 Add custom unsubscribe option in a campaign 2018-08-01 10:46:34 +02:00
Adrian Woeltche
4f65a295fb fixed sending test mail 2018-07-31 15:30:52 +02:00
Adrian Woeltche
9b1ab6fc5b another grapejs update and fix for images 2018-07-31 13:54:43 +02:00
Tomas Bures
0e0fb944e3 First attempt on campaign editing. Misses attachments. Untested. 2018-07-31 10:04:28 +05:30
Balázs Kovács
4bd1e994b2 warn on failed login 2018-07-29 01:38:29 +02:00
Raphael Hittich
44fe8882b8 Add X-Mailer header option in settings to override or disable it. 2018-07-27 14:46:46 +02:00
Tomas Bures
ee786bc8ad Fixes in migration of templates and campaigns from Mailtrain ver 1 2018-07-22 15:02:43 +05:30
Tomas Bures
189638364c Added migration for campaigns 2018-07-22 00:01:28 +05:30
Tomas Bures
e85c707973 Some small updates coming from IVIS 2018-07-18 18:41:18 +01:00
Adrian Woeltche
65f25bb009 more updates 2018-07-11 17:26:50 +02:00
Adrian Woeltche
7327fdbeab fixes removed as they cause problems with new version that seems to have implemented own fixes, hopefuly without side effects 2018-07-11 16:34:20 +02:00
Adrian Woeltche
a56b4823a1 readded files (tested) 2018-07-11 16:10:18 +02:00
Adrian Woeltche
c6dd8ac7f9 permit to erase styles 2018-07-11 16:05:06 +02:00
Adrian Woeltche
b14bde2a6f wrong file 2018-07-11 15:51:59 +02:00
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