Commit graph

200 commits

Author SHA1 Message Date
Andreas Teuber
cdaf4b0b16 Added description to custom fields 2018-10-31 11:18:31 +01:00
Tomas Bures
ee0d148427 Merge branch 'pr453' 2018-08-05 17:44:58 +05:30
Tomas Bures
c37649a3db Merge branch 'pr450' 2018-08-05 17:36:29 +05:30
Tomas Bures
8193f0bf4d Merge PR #451 2018-08-05 17:36:10 +05:30
Tomas Bures
dfac6cec80 Merge branch 'pr449' 2018-08-05 17:27:26 +05:30
Tomas Bures
fe7d34e0f6 Merged pull request #412 2018-08-05 17:22:31 +05:30
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
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
Raphael Hittich
44fe8882b8 Add X-Mailer header option in settings to override or disable it. 2018-07-27 14:46:46 +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
d6f7f9a055 grapejs update 2018-07-11 15:50:02 +02:00
humancopy
ceba65a098 Add the possibility to create a negated rule on segments 2018-07-02 14:26:59 +02:00
Reto Kaiser
16ce44146f Add option on list to disable "List-Unsubscribe" header 2018-06-13 09:53:29 +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
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
Douglas F Shearer
549cc70c4f Fix spelling in email field help block. 2018-04-26 13:20:41 +01:00
Jonas Düver
006e4aa116 Add segment support to triggers frontend 2018-04-25 18:15:14 +02:00
Georgios Anastasiou
b151784071 Docs for api/lists/:email 2018-02-06 14:57:58 +02:00
Roger Witzig
eb8a5878dd
Merge pull request #344 from brentdur/brentdur/247_template-duplicate
Adds duplicate Template
2017-11-15 12:56:34 +01:00
Gerard Krol
8b2e3b47b0 Add note about generated names of custom fields. 2017-11-08 10:54:18 +00:00
Gerard Krol
ac09ba81dd Add API documentation for GET /api/subscriptions/:listId 2017-11-06 10:34:55 +00:00
Brenton Durkee
0cbec006b4 Adds duplicate button to Template edit form.
Adds duplicate model function for Template that gets a Template by id
and creates a new Template with the same data.
2017-10-16 11:29:57 -04:00
witzig
0a369e2475 Fix grouped custom fields not saving deselected values #333 2017-10-05 13:39:53 +02:00
witzig
46acece89c Improve CSV import error handling, closes #324 2017-09-29 00:32:00 +02:00
witzig
83e62e990b Update import.hbs 2017-09-29 00:19:19 +02:00
witzig
c5b481a266 Add option to preserve unsubscribed status on list import, #325 2017-09-28 00:55:19 +02:00
witzig
bd570000e1 Added documentation for API endpoint /api/field/:listId
This has accidentally been removed with PR #203.
2017-07-06 15:08:35 +02:00
witzig
f0e32ef5a5 Added note about blacklist, #272 2017-07-01 01:50:50 +02:00
witzig
3c4558d70c Refactored and linted editorapi image handling 2017-06-20 19:08:14 +02:00
Andris Reinman
8b900a9c44 Removed ads from code 2017-06-20 16:47:25 +03:00
witzig
a7b2c33b30 GrapeJS MJML Integration (Experimental)
#215
2017-05-31 02:08:44 +02:00
vladimir
25bb4afa80 Merge with upstream 2017-05-27 14:07:56 +02:00
vladimir
59912e3c29 Separate disable opened/clicked tracker to 2 options 2017-05-27 14:04:49 +02:00
Tomas Bures
62cc881fd4 Merge remote-tracking branch 'upstream/master' 2017-05-18 22:46:53 +02:00
witzig
6c35046ab2 e2e tests (draft) 2017-05-10 01:40:02 +02:00
Tomas Bures
11990d62b2 Merge branch 'master' of github.com:Mailtrain-org/mailtrain
Conflicts:
	languages/de_DE.po
2017-05-04 17:58:55 -04:00
Tomas Bures
a6d25e668b Release candidate of the selectable unsubscription
Implemented the resubscription process - i.e. pre-filling in the form when the subscription link is clicked in the unsubscription notice.
2017-05-04 17:42:46 -04:00
witzig
408db13fd4 Updated RSS merge tag reference 2017-05-03 23:13:05 +02:00
Tomas Bures
bd4961366f More or less all the functionality for selectable unsubscription process. Not tested yet!
Sending emails moved completely to controller. It felt strange to have some emails sent from the controller and some of them from the model.
Confirmations refactored to an independent model that can be potentially used also for other actions that need an email confirmation.
2017-05-03 15:53:34 -04:00
Tomas Bures
32e2e61789 Unsubscription is identified by subscriber cid. This effectivelly allows only the recipient of the email to unsubscribe. This addresses issue #221.
I also scraped the "auto" parameter which automatically submits the unsubscription form when the link is clicked in a campaign email. Instead, I introduced the
unsubscription options ONE_STEP, ONE_STEP_WITH_FORM, TWO_STEP, TWO_STEP_WITH_FORM. The options without "_WITH_FORM" shall behave like when called with "auto".
This functionality is to come. Currently it behaves as ONE_STEP_WITH_FORM.
2017-04-30 13:01:22 -04:00
Tomas Bures
3783d7c2ce Halfway through extending subscriptions by selectable unsubscription process. Also contains changes towards better handling of scenarios when address is already subscribed. 2017-04-30 10:51:47 -04:00
Tomas Bures
3072632d8d Fixed eslint errors 2017-04-23 15:24:31 -04:00
Tomas Bures
8237dd5d77 The "Reports" feature seems functional.
Some small refactoring (column widths) of rendering tables in Lists, Templates, and Campaigns so that it is the same as Reports.
2017-04-20 19:42:01 -04:00
Tomas Bures
2056645023 Added the option to select lists in report.
Added an option to generate a CSV report.
2017-04-17 16:30:31 -04:00