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

1125 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ff66a6c39e Helper tool for cleaning node_modules 2019-06-15 13:48:14 +02:00
Tomas Bures
f8e9d67568 Fixes for #613 
Segment selection invalidated when one changes another list in campaign edit.
 2019-06-15 11:12:26 +02:00
Tomas Bures
4736afd5ab Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development-tb 2019-06-15 10:25:21 +02:00
Tomas Bures
afe12cba0f
Merge pull request #609 from trucknet-io/bugfix/#606 
Added getting of variables to TemplateSender [Resolves #606]
 2019-06-11 18:59:47 +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
801fb7c81d
Merge pull request #604 from trucknet-io/development 
fix: added imagemagick to dockerfile;
 2019-06-05 08:23:29 +02:00
Alexander Gusev
7ae463ea72 fix: added imagemagick to dockerfile image; 2019-06-05 08:47:26 +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
640d3c2f11 Some fixes 2019-05-20 00:38:39 +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
97b4bb7574 Mosaico MJML sample updated to showcase conditional display markup. 2019-05-19 19:20:02 +02:00
Tomas Bures
e40793b874 Fixes to detecting changes in forms. 2019-05-19 19:07:10 +02:00
Tomas Bures
cbb29a0840 Fixes to detecting changes in forms. 2019-05-19 19:06:30 +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
8eae6d6c41 Update of extract.js to process translations in other languages. 2019-05-13 01:07:01 +02:00
Tomas Bures
79164c5fe5 Update of extract.js to process translations in other languages. 2019-05-13 00:45:36 +02:00
Tomas Bures
0e9d192b1f Update of extract.js to process translations in other languages. 2019-05-13 00:35:19 +02:00
Tomas Bures
b1efb95315 Update of extract.js to process translations in other languages. 2019-05-12 23:59:13 +02:00
Tomas Bures
03bcba1667 Merge branch 'pull/595' into development-tb 2019-05-12 10:09:33 +02:00
Tomas Bures
e064948838 RC1 of confirmation dialogs displayed when one navigates from a page with unsaved changes. 
Fixes in Share and UserShare.
 2019-05-12 10:00:10 +02:00
Tomas Bures
c4b78c4823 Work in progress on confirmation dialogs displayed when one navigates from a page with unsaved changes. 
Optimized imports.
 2019-05-12 00:18:04 +02:00
Tomas Bures
008fd21b51 Work in progress on confirmation dialogs displayed when one navigates from a page with unsaved changes. 
Optimized imports.
 2019-05-12 00:00:09 +02:00
Tomas Bures
3921a6b2cb Work in progress on confirmation dialogs displayed when one navigates from a page with unsaved changes. 
Optimized imports.
 2019-05-08 23:48:13 +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
0618d899c0
Update langs.js 2019-05-06 10:14:52 -03:00
bbraganca
7f979d554e
Update translate.js 2019-05-06 10:14:11 -03:00
bbraganca
91c059144f
Update i18n.js 2019-05-06 10:12:44 -03:00
bbraganca
b0c3858268
Create common.json 2019-05-06 10:10:57 -03:00
Tomas Bures
4f77272042 Updated ivis-core 2019-04-22 22:48:08 +02: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
c00bd68123 Removed package-lock.json, such that it is automatically updated during install. It seems that at this point, we might have more problems with stale package-lock.json than with incompatible dependencies. 2019-04-15 19:44:13 +02:00
Tomas Bures
1f1cf81a17 New versino of ivis-core. It is not used at moment, so this should not really affect anything. 2019-04-15 18:52:07 +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
d0d42ab280
Merge pull request #579 from trucknet-io/development 
Dockerfile update
 2019-04-15 18:13:33 +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
Alexander Gusev
8a879c91bd chore: Dockerfile update 
node:10-14-alpine image is used (because jessie is oudated and can not install packages
adding package-lock.json to make sure the same dependencies' versions are used
added an option to pass redisHost, mongoHost, mysqlHost to use in Kubernetes cluster
 2019-04-03 14:25:09 +03: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