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

1268 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tomas Bures
30e03adf0c Fix for #619 
Merged parts of PR #651 and fixed the rest
 2019-08-07 14:29:58 +02:00
Tomas Bures
5cae9c849c Merge branch 'pull/651' into development 2019-08-07 12:29:30 +02:00
Tomas Bures
cce998d89e Merge branch 'pull/656' into development 2019-08-07 11:45:20 +02:00
Tomas Bures
2202f228eb Merge of PR #654 and some updates to it. 2019-08-07 11:25:47 +02:00
root
ee3fb1bbd1 Campaign tag language bug fixed 2019-08-06 11:38:07 +02:00
root
c1a9404648 Verp campaign BUG fixed 2019-08-06 09:37:02 +02:00
root
2929048ebe Fix 2019-08-06 09:26:44 +02:00
root
b08fd07909 convertFileURLs fix 2019-08-06 09:25:22 +02:00
root
e55317ec43 Clone existing template BUG fixed 2019-08-05 13:31:56 +02:00
Carlos Zamora Sanz
b7fbc32e1e
Merge pull request #1 from Mailtrain-org/development 
Merge
 2019-08-05 09:20:13 +02:00
Tomas Bures
5abe809a97 Merge remote-tracking branch 'origin/development' into development 2019-08-01 07:46:55 +02:00
Tomas Bures
712a905518 Fixes of functions around viewTestSubscriptions 2019-08-01 07:46:40 +02:00
Tomas Bures
a4a5a468ea
Merge pull request #647 from deisner/patch-1 
Update README.md
 2019-08-01 04:51:51 +02:00
David Eisner
836faeff69
Update README.md 
Typo fix.
 2019-07-31 16:26:35 -04:00
Tomas Bures
ed3ed1a202 Some small updated in UI 2019-07-31 16:50:06 +02:00
Tomas Bures
dba534ba21 Fix - login screen does not show up 2019-07-29 10:00:01 +02:00
Tomas Bures
a876c7b301 Version on the home screen updated. 2019-07-29 09:47:47 +02:00
Tomas Bures
e77038f132 fixup! Various fixes. 2019-07-29 09:25:07 +02:00
Tomas Bures
a258479621 Various fixes in the UI. 
Check permissions mechanism reworked to allow specifying permission checks already in menu structure.
 2019-07-29 09:24:50 +02:00
Tomas Bures
a46c8fa9c3 Remove button removed from the namespace that contains the current user. 
Optimizations in how mixins are composed. The refresh should now be up to 2x faster for deeper hierarchies.
 2019-07-27 17:47:25 +02:00
Tomas Bures
6ae9143c22 Added abstraction layer around config. 
`roles` in config renamed to `defaultRoles`. These are used if no `roles` are provided in production.yaml
 2019-07-26 20:35:49 +05:30
Tomas Bures
8cd01fe99e Fix for #639 2019-07-26 18:32:14 +05:30
Tomas Bures
d247893d31 Refactoring a common pattern for "clone for existing". Applied to custom forms and templates. 2019-07-26 16:48:26 +05:30
Tomas Bures
6eeef7a991 Merge branch 'pull/637' into integration-637 
# Conflicts:
#	client/src/lists/forms/CUD.js
 2019-07-24 14:54:51 +05:30
Tomas Bures
b65960b528 Merge of PR #641 2019-07-23 22:14:35 +05:30
root
ff9191c206 Add multiple lists in a campaign 2019-07-23 22:11:53 +05:30
root
f987cb1197 Change campaign namespace BUG correction 2019-07-23 22:11:53 +05:30
Tomas Bures
02360be75b Various fixes. 2019-07-23 21:16:55 +05:30
root
1bf37e65a3 Clone from existing custom forms Added 2019-07-23 12:35:41 +02:00
Tomas Bures
4e4b77ca84 Fixes. 
Added support for help text in custom fields.
Reimplemented the mechanism how campaign_messages are created.
 2019-07-22 23:54:24 +05:30
root
e9bf4a890c Copy custom forms added 2019-07-22 13:01:48 +02:00
Tomas Bures
025600e818 Fixes. Reimplementation of the API transaction sender. 2019-07-16 21:10:33 +05:30
Tomas Bures
8606652101 Fixes. Reimplementation of the API transaction sender. 2019-07-16 21:03:37 +05:30
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
75138f9728
Merge pull request #618 from galaxycard/development 
allow attachments from api
 2019-07-03 20:33:46 +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
deb6f1f294
Update README.md 2019-06-26 18:10:21 +02:00
Tomas Bures
355e03900a Fix - subject line is not saved 2019-06-25 12:35:04 +02:00
Tomas Bures
a9039e5760 Fix - subject line is not shown when send configuration is not selected 2019-06-25 12:17:30 +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
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