Commit graph

160 commits

Author SHA1 Message Date
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
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
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
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