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

108 commits

Author SHA1 Message Date
Tomas Bures
a22187ef12 Merge remote-tracking branch 'origin/development' into development-tb 
# Conflicts:
#	server/lib/template-sender.js
#	server/routes/api.js
 2019-07-10 02:13:19 +04:00
Tomas Bures
e3a5a3c4eb Fixed some bugs in subscription process 
Added timezone selector to campaign scheduling
Fixed problems with pausing campaign.
 2019-07-10 02:06:56 +04:00
Tomas Bures
4113cb8476 Work in progress on tag language 
Fix - message sent to a list not associated with a campaign couldn't be shown in archive - to know which message to show even if the list is not at the campaign, we store test messages in table test_messages
 2019-07-05 23:23:02 +02:00
Tomas Bures
00e328a914 Work in progress on introducing tag language. Not tested yet. 2019-07-03 11:58:58 +02:00
Tomas Bures
450b930cc5 Work in progress on refactoring all mail sending to use the message sender an sender workers. 
Some fixes related to subscriptions and password reset.
 2019-06-30 10:47:09 +02:00
Tomas Bures
4e9f6bd57b Work in progress on refactoring all mail sending to use the message sender an sender workers. No yet finished. 2019-06-29 23:19:56 +02:00
Tomas Bures
30b361290b - Refactoring of the mail sending part. Mail queue (table 'queued') is now used also for all test emails. 
- More options how to send test emails.
- Fixed problems with pausing a campaign (#593)
- Started rework of transactional sender of templates (#606), however this contains functionality regression at the moment because it does not interpret templates as HBS. It needs HBS option for templates as described in https://github.com/Mailtrain-org/mailtrain/issues/611#issuecomment-502345227

TODO:
- detect sending errors connected to not able to contact the mailer and pause/retry campaing and queued sending - don't mark the recipients as BOUNCED
- add FAILED campaign state and fall into it if sending to campaign consistently fails (i.e. the error with sending is not temporary)
- if the same happends for queued email, delete the message
 2019-06-25 07:18:06 +02:00
amit.kumar
20603f679c allow attachments from api 2019-06-19 15:55:39 +05:30
Tomas Bures
4736afd5ab Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development-tb 2019-06-15 10:25:21 +02:00
Alexander Gusev
39f3682c27 fix(transactionalApi): added getting of variables to TemplateSender [Resolves #606] 2019-06-11 19:37:45 +03:00
Tomas Bures
fcd2a61b65 Child processes are now terminated when the parent process dies. This means that if the main mailtrain process gets killed, there are no processes which remain running. 2019-05-25 21:57:11 +02:00
Tomas Bures
1270ca71f8 Some fixes 2019-05-25 21:18:18 +02:00
Tomas Bures
3c72e778d9 Merged PR #528 
Support for detecting MTA by its response. Message IDs are reconstructed based on detected MTA.
Bugfixes for AWS. AWS now seems to work.
 2019-05-20 00:21:03 +02:00
Tomas Bures
bbbe671d59 Merge branch 'pull/528' into development-tb 2019-05-19 22:22:29 +02:00
Tomas Bures
2e9d44c705 Added ability to make a conditional block in MJML Mosaico. 
Mosaico switched from master to v0.17.5
Added workaround for Chrome - after save, images in Mosaico disappear
 2019-05-19 01:42:26 +02:00
Tomas Bures
a527b80291 Update of source files and integration of Portuguese translation 2019-05-13 01:10:53 +02:00
Tomas Bures
03bcba1667 Merge branch 'pull/595' into development-tb 2019-05-12 10:09:33 +02:00
Tomas Bures
48dcf2c701 Mosaico upgraded to 0.17.5 
Work started on confirmation dialogs displayed when one navigates from a page with unsaved changes
 2019-05-08 19:54:19 +02:00
bbraganca
856636d12e
Update translate.js 2019-05-06 10:19:36 -03:00
bbraganca
f04c549d24
Update translate.js 2019-05-06 10:19:02 -03:00
bbraganca
7f979d554e
Update translate.js 2019-05-06 10:14:11 -03:00
Tomas Bures
72ffe065d2 Added quick reports (at this moment only one) to campaign statistics page. 2019-04-22 22:46:48 +02:00
Tomas Bures
3e3c3a24fe Further updated on caching. Small change in DB schema to make lookups a bit more performant. Note that if DB migration in the last commit has been run, this commit will need manual update of the database. 2019-04-22 15:41:39 +02:00
Tomas Bures
ef0464bbc9 Further improvements in caching. The state of the cache is now persisted in DB. This persists the cache between server restarts. 2019-04-22 11:41:37 +02:00
Tomas Bures
7bcd6c60e9 The previous commit had some services disabled to speed up testing. The services are back now. 2019-04-22 02:58:10 +02:00
Tomas Bures
66702b5edc Fixes in reports (generating a CSV). 
Added caching of generated images in mosaico handler.
Various other fixes.
 2019-04-22 02:41:40 +02:00
Tomas Bures
055c4c6b51 package-lock.json is updated and back. The client is hopefully fixed w.r.t. #571. 2019-04-15 20:53:36 +02:00
Tomas Bures
b8f8750afd Imported some enhancements from IVIS. Candidate for a fix for #571. 2019-04-15 18:47:30 +02:00
Tomas Bures
94a2cdf89e More elements for mosaico mjml support. Added "MJML Sample" wizard to mosaico templates. 2019-04-03 23:39:10 +02:00
Tomas Bures
ec0f288d81 Merge remote-tracking branch 'origin/development' into development 2019-04-03 12:14:09 +02:00
Tomas Bures
ad9f5d16bf Added support to define mosaico templates in MJML. (A wizard that shows how to do this is TODO.) 
Adopted some core features (router, etc.) from IVIS.
 2019-04-03 12:13:49 +02:00
Alexey Zinkevych
8b39a101cd Transactional mail: minor template-sender refactoring 2019-04-02 16:35:57 +03:00
Alexey Zinkevych
e588e218b6 Transactional mail: use tools to format message 2019-04-02 16:15:35 +03:00
Alexey Zinkevych
76b4f8b8c2 Transactional mail: added data rendering 2019-04-02 14:44:07 +03:00
Alexey Zinkevych
80279346f3 Transactional mail: code review fixes 2019-03-31 15:50:40 +03:00
Alexey Zinkevych
31442453ea Merge branch 'transactional-mail-v2' into development 2019-03-31 12:57:55 +03:00
Alexey Zinkevych
e3e1e7a086 Merge branch 'development' of https://github.com/Mailtrain-org/mailtrain into transactional-mail-v2 2019-03-31 11:52:42 +03:00
Tomas Bures
3b20ac5ce7 Some fixes in expection logging, template files and resizing mosaico images 2019-03-27 23:50:20 +01:00
Tomas Bures
d482d214d9 Line endings fixed so that we don't have CRLF in Git. Better now than later. 2019-03-27 09:49:29 +01:00
Tomas Bures
2fe7f82be3 Merge and cleanup of PR #564 
The namespace filter in campaigns was dropped (i.e. "Work with campaign's namespace"). Instead, we need a universal solution. For instance a namespace slector somewhere in the top-right corner, which should apply to everything (not just campaigns).

Nevertheless, I kept the ...-by-namespace rest endpoints and related functions in models because they will be useful for implementing the universal namespace selection feature.
 2019-03-27 00:41:18 +01:00
Tomas Bures
dcb7168322 Merge branch 'pull/564' into development 2019-03-26 22:55:00 +01:00
Alexey Zinkevych
4a521a8f0f Implemented basic transactional emails API 2019-03-25 14:48:18 +02:00
Carlos
53340ad631 fix 2019-03-20 09:03:06 +01:00
Carlos
444717b4d0 Templates namespace filtering & fix 2019-03-20 08:57:06 +01:00
Carlos
74fe5e73e2 Namespace filtering when create/edit campaigns 2019-03-14 16:15:37 +01:00
Carlos
1a61067ff9 Campaign status show send settings Bug 2019-03-13 09:52:02 +01:00
Tomas Bures
9b32e59b50 Number of processes and connections of builtin zone MTA is now configurable via Mailtrains config. 2019-03-09 14:07:11 +01:00
Tomas Bures
97bb700334 Various fixes 2019-03-09 07:42:14 +00:00
Carlos
25ecd85910 CampaignNamespaceUpdateBugFixed 2019-03-06 09:47:52 +01:00
Carlos
a43302f3ab Users list only for admin added 2019-03-04 15:57:51 +01:00