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

197 commits

Author SHA1 Message Date
Tomas Bures
4252a08c39 Fix for #690 2019-08-23 13:56:22 +02:00
Tomas Bures
af2e988ae7
Merge pull request #687 from Charlo270398/development-LDAPfirstLogin 
LDAP - Users not created on the fly upon first login fixed #683 (good one)
 2019-08-21 14:43:58 +02:00
root
de15ba15da LDAP mailTag fix 2019-08-21 14:41:35 +02:00
root
cc73c679e5 Statistics not tracked when the user is not a test user fixed 2019-08-21 14:18:43 +02:00
root
6beac55826 LDAP first login BUG fixed 2019-08-21 08:24:33 +02:00
Tomas Bures
ebb6c2ff74
Merge pull request #677 from galaxycard/bugfix/clearQueue 
Clear old message by datetime, not by timestamp)
 2019-08-20 14:48:28 +02:00
GuillaumeRemyCSI
2f9a75df9b Fixes the authMode name for passport-ldapjs and add a parameter for LDAP mailTag 2019-08-20 10:00:51 +02:00
amit.kumar
8d27676278 Add mergeTags to sendMessage 2019-08-15 20:16:06 +05:30
amit.kumar
8bda0c05c0 Clear old message by datetime, not by timestamp) 2019-08-15 13:23:54 +05:30
Guillaume Rémy
98cd14f8be Added ldap secure parameter in default.yaml config file 2019-08-14 11:30:03 +02:00
Guillaume Rémy
c8eeeaa9b9 Added secure config parameter to use ldaps protocol 2019-08-14 11:18:38 +02:00
Tomas Bures
ae5faadffa Fix for #665 and additional fix for #663. 
If your segemnts are broken or Mailtrain complains about missing 20190726150000_shorten_field_column_names.js, run the following in `server/setup/knex/fixes`:

```NODE_ENV=production node fix-20190726150000_shorten_field_column_names.js```
 2019-08-12 09:26:49 +02:00
Tomas Bures
bb237b3da4 Fix - URL bases replacement didn't work for HBS tag language. 2019-08-11 21:50:06 +02:00
Tomas Bures
23e683192f Additional fix for #660 
Fix for #662
 2019-08-11 21:01:01 +02:00
Tomas Bures
8cb24feca1 Fix for #660 
Campaign preview and campaign test send pulls the first entry in the RSS feed and substitutes its data in `[RSS_ENTRY_*]`
 2019-08-11 16:28:11 +02:00
Tomas Bures
588cf34810 Fix for #663 2019-08-10 23:17:15 +02:00
Tomas Bures
69ce80ebfd Fix for #663. 
Unfortunately, the migration 20190726150000_shorten_field_column_names.js corrupted the segments table. There is no automatic fix. If this affected you, you have to either revert the DB or fix the segments manually.
 2019-08-10 23:15:38 +02:00
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
2202f228eb Merge of PR #654 and some updates to it. 2019-08-07 11:25:47 +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
Tomas Bures
712a905518 Fixes of functions around viewTestSubscriptions 2019-08-01 07:46:40 +02:00
Tomas Bures
ed3ed1a202 Some small updated in UI 2019-07-31 16:50:06 +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
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
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
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
Carlos
38e277cb7c Spanish lang without translation added 2019-03-04 15:44:52 +01:00
Tomas Bures
d54f941caa Some fixes. 2019-02-24 00:19:49 +00:00
Tomas Bures
41cd01c2b9 Exported CSV now contains status column (fix for #547) 2019-02-23 14:27:28 +00:00
Tomas Bures
0c3510d626 Some fixes 2019-02-18 22:42:57 +00:00
Tomas Bures
8d95f43dbc Added feature to create template from another template. 2019-02-18 20:36:44 +00:00
Tomas Bures
031b346440
Merge pull request #537 from priethor/development 
Adds 'type' property to migration of text-based segment rules
 2019-02-17 18:48:13 +01:00
Tomas Bures
f8ef57f164 Fixed bug that prevented sending via builtin zone mta. This but was introduced today. 2019-02-17 17:47:27 +00:00
Héctor
433bf31bfa
Adds 'type' property to migration of text-based segment rules 
In v2, text-based segment rules need a "type" property. As in v1 the value could contain % wildcards, the default type for migrated rules should be 'like' to support them.
 2019-02-17 18:45:35 +01:00
Tomas Bures
f7b5aef0e3 Some more fixes 
Warning dialog about missing Javascript removed from subscription dialog. The warning would flash in any case (even when Javascript is activated)
 2019-02-17 17:18:59 +00:00
Tomas Bures
46ad0c7b4f Fix for #531 2019-02-17 12:46:02 +00:00
Héctor
d1a1398828
Support for string based segment rules.... 
...such as email fields.
 2019-02-17 00:49:12 +01:00