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

185 commits

Author SHA1 Message Date
Andrés Martano
ecabc962ef
typo 2020-01-25 12:54:19 +00:00
Tomas Bures
97a40033d6 Added "Sender" role to lists 2020-01-16 21:30:55 +01:00
Tomas Bures
a3eaf72203 Updated dependencies 
Version updated
 2020-01-12 12:55:03 +01:00
Tomas Bures
7914077acb Added 'sendToTestUsers' permission to templates to control if a user can send a template to test users. (Up till now this was permitted by default.) 
Campaigns list is now by default ordered by 'Created' in descending order.

Fixed display bug - two clicks on main menu item made it disappear

Campaign Status is now protected by 'view' permission. (Up till now it was 'viewStats' permission.)

Fixes in campaign status to hide send buttons and test send button if a user does not have necessary permissions.

Templates, Mosaico templates and Campaigns (edit and content) are now displayed to user even if the user does have only 'view' permission (not 'edit'). A banner is displayed that the user cannot save any changes and buttons are removed from the edit pages. This is to allow users to copy settings and content from existing campaigns which they are not supposed to edit. A better solution would be to display the edit and content form in read-only mode, but this seems to be a bit complicated.
 2020-01-12 12:07:14 +01:00
Tomas Bures
57907f9260 Merge of of PR #827 2020-01-11 13:59:59 +01:00
Chris
2204bbe70c Fix missing tx refrence, https://github.com/Mailtrain-org/mailtrain/issues/811 2020-01-08 10:58:28 +13:00
Tomas Bures
9d4506977d Fixes #824 "ReferenceError: os is not defined" 2020-01-03 14:30:44 +01:00
Tomas Bures
6f463b0b82 Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development 2020-01-03 14:28:02 +01:00
Tomas Bures
d7d626cbc0 Addresses #785 "Allow segmentation by Subscription Status" 2020-01-03 14:27:47 +01:00
Kevin Jilissen
2733912dda Update documentation for ZoneMTA pool name addition. 2019-12-31 12:58:05 +01:00
Kevin Jilissen
0e7a5dae82 Add possibility to set pool name for builtin ZoneMTA. 2019-12-31 01:28:08 +01:00
Tomas Bures
3c4fbf2754 Merge branch 'pull/723' into development 
# Conflicts:
#	mvis/ivis-core
 2019-12-07 13:56:49 +01:00
Tomas Bures
2b60af2605 Merge remote-tracking branch 'origin/development' into development 2019-12-07 13:52:39 +01:00
Tomas Bures
0298a1dcbe Updated packages and fixed problems caused by the update. 2019-12-07 13:51:59 +01:00
Tomas Bures
cc34d89283
Merge pull request #679 from galaxycard/bugfix/missingMergeTags 
Add mergeTags to sendMessage
 2019-12-07 11:59:29 +01:00
Tomas Bures
6d00ea1e69 Merged PR #724 2019-12-07 11:53:18 +01:00
Tomas Bures
52c638b0b3 Merge branch 'pull/724' into development 2019-12-07 11:48:57 +01:00
Tomas Bures
7df580d7e2 Merged PR #740. 2019-12-07 11:21:19 +01:00
Tomas Bures
e6b1cf8add Merge branch 'pull/740' into development 2019-12-07 11:11:44 +01:00
Tomas Bures
964ff80cfa Merge branch 'pull/741' into development 2019-12-07 10:49:23 +01:00
Tomas Bures
63a79ae36d Updated packages and fixed problems caused by the update. 2019-12-07 10:47:57 +01:00
Tomas Bures
cd2fdb9e23 Updated packages. 
Merged #763 + some variable renaming
 2019-12-07 09:28:17 +01:00
Tomas Bures
e61e0fb802 Merge branch 'pull/763' into development 2019-12-07 08:24:34 +01:00
Tomas Bures
4cdc4ed833
Merge pull request #789 from notz/fix-trigger-campaign-id 
Fix trigger campaign id
 2019-12-07 08:19:29 +01:00
Markus Opolka
43edf35637 Reduce Docker image size 
- Removed node_modules from client after compilation
 - Added copy-webpack-plugin to copy required JS and fonts to dist
 - Adjusted server to serve files from client/dist
 - add js-yaml to server packages in order to use npm install --production
 2019-12-05 13:16:37 +01:00
Gernot Pansy
e2a69ef76d Added subscription changed trigger 
Is very useful if some subscription data is updated by API and you want to trigger after that because segments (filters) have changed.
 2019-12-03 09:08:40 +01:00
Gernot Pansy
1145bf36cf fix trigger campaign id 2019-12-03 08:56:12 +01:00
Tomas Bures
ed2655b78e
Merge pull request #773 from sedrubal/add-cid-to-get-lists-for-email-api-call 
Add Field `cid` to `/api/lists/:email`
 2019-11-26 21:12:07 +01:00
Markus Opolka
aa1baae5b5 Add German Translation for Mailtrain v2 2019-11-13 10:15:45 +01:00
Eric Uldall
b2bb0b642f added campaignId to query for campaign_messages 2019-11-12 13:27:46 -08:00
sedrubal
082901e4e7
Add Field cid to /api/lists/:email 
With this `cid` you are able to do further API calls like unsubscribing
the user from all mailing lists.
 2019-11-10 00:43:41 +01:00
Eric Uldall
cb4e3c76d3 added code to allow failed messages from bad content url 2019-10-31 20:42:33 -07:00
Gernot Pansy
e7e0f78742 fix trigger delay calculation 2019-10-21 09:39:42 +02:00
Gernot Pansy
6e04f782e3 insert triggered campaign campaign message to campaign_messages table 
This fixes that triggered campaign e-mails are not reported in ui and so it's also possible to
create another triggered campaign on this first triggered one.

What i don't understand why their is a difference in handling of a triggered campaign and a normal one in sending.

Also i expected that a triggered campaign can only be send once to an user regardless which trigger fires the send.
But currently it's send for every trigger that is defined in a campaign.
 2019-10-21 09:30:00 +02:00
Gernot Pansy
fe39ec5134 Send triggered campaigns only to active subscribers 2019-10-10 12:37:31 +02:00
Tomas Bures
b6ed5e56b9 Date/time and device type in quick report. 
Fix - invalid campaign when one tried to unsubscribe from a test message before campaign was sent
 2019-09-05 15:51:17 +02:00
Tomas Bures
2aaa8f45b3 Work in progress on integration of IVIS. 
Some fixes.
 2019-08-31 11:46:18 +02:00
Tomas Bures
3a17d7fd75 Merge remote-tracking branch 'origin/development' into development 2019-08-23 13:57:22 +02:00
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