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

1113 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gernot Pansy
d5ddba2a40 Allow select segments on triggered campaigns 
Don't know why this is disabled. Tested everything and it's working as expected.
 2019-10-10 12:32:30 +02:00
Tomas Bures
cbf2a6e39d
Merge pull request #714 from martialblog/docker 
Optimise Docker Image
 2019-10-02 13:19:47 +03:00
Markus Opolka
12210a1bf5 Update Dockerfile to make image smaller 
- Added multistaged build
 - Moved production depedencies to final stage
 - Added more verbose output during build
 2019-10-02 12:05:32 +02:00
Markus Opolka
77e7df7b83 Add more mysql database parameters to entrypoint 2019-10-02 10:56:50 +02:00
Markus Opolka
7620e1564d Extend .dockerignore file to make image smaller 2019-10-02 09:48:27 +02:00
Tomas Bures
cdd57224f6
Merge pull request #712 from Pistus/fix/711-keep-aws-secret 
Fix/711 keep aws secret
 2019-09-27 10:57:13 +02:00
Frode Jensen
9914fa33d8 fix(aws-ses): Make AWS SES secret a password field 2019-09-27 10:39:39 +02:00
Frode Jensen
e85b1fcfff fix(aws-ses): Add label for Aws ses secret 2019-09-27 10:38:59 +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
2e4dc1bce4 Work in progress on integration of IVIS. 
Some fixes.
 2019-08-31 12:04:03 +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
427f0ec2c2 Some cleanup/small fixes. 2019-08-23 13:50:43 +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
Tomas Bures
5abf100776
Merge pull request #686 from Charlo270398/development-statisticsBUG 
Statistics not tracked when the user is not a test user fixed
 2019-08-21 14:34:55 +02:00
root
cc73c679e5 Statistics not tracked when the user is not a test user fixed 2019-08-21 14:18:43 +02:00
Tomas Bures
a17ee3d9bf Fix for #659 2019-08-21 13:18:03 +02:00
root
6beac55826 LDAP first login BUG fixed 2019-08-21 08:24:33 +02:00
Carlos Zamora Sanz
3e374db722
Merge pull request #6 from Mailtrain-org/development 
Development
 2019-08-21 08:08:22 +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
Tomas Bures
52652d8ac5
Merge pull request #681 from Charlo270398/development-LDAPeditUserBUG 
LDAP edit users BUG fixed
 2019-08-20 14:42:23 +02:00
Tomas Bures
f5f9426e9c
Merge pull request #684 from GuillaumeRemyCSI/ldap-fixes 
Fixes the authMode name for passport-ldapjs and add a parameter for LDAP mail attribute
 2019-08-20 10:12:04 +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
Carlos Zamora Sanz
415dbcb14f
Merge pull request #5 from Mailtrain-org/development 
Development
 2019-08-19 10:28:12 +02:00
root
732a9e4d93 LDAP edit users BUG fixed 2019-08-16 13:00:27 +02:00
amit.kumar
8bda0c05c0 Clear old message by datetime, not by timestamp) 2019-08-15 13:23:54 +05:30
Tomas Bures
71737fa656
Merge pull request #673 from Charlo270398/development-CreateReportBug 
Create report BUG
 2019-08-14 15:15:59 +02:00
root
70ca9f405a fix 2019-08-14 15:13:27 +02:00
Carlos Zamora Sanz
6a8f139b43
Merge pull request #4 from Mailtrain-org/development 
Development
 2019-08-14 14:35:19 +02:00
root
7ec6f9e6d0 Report CUD fix 2019-08-14 14:25:07 +02:00
Tomas Bures
1295d83c59
Merge pull request #671 from GuillaumeRemyCSI/new-parameters-in-docker-entrypoint 
Added new parameters for LDAP in docker-entrypoint.sh
 2019-08-14 14:14:18 +02:00
Guillaume Rémy
de20d8a64c Added new parameters for LDAP in docker-entrypoint.sh 2019-08-14 13:35:46 +02:00
Tomas Bures
5281707b2d
Merge pull request #670 from GuillaumeRemyCSI/secure-ldap 
Added secure ldap parameter in default.yaml config file
 2019-08-14 11:45:23 +02:00
Guillaume Rémy
98cd14f8be Added ldap secure parameter in default.yaml config file 2019-08-14 11:30:03 +02:00
Tomas Bures
54f7225077
Merge pull request #669 from GuillaumeRemyCSI/secure-ldap 
Added secure config parameter to use ldaps protocol
 2019-08-14 11:24:15 +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
Carlos Zamora Sanz
6b6fa8b3ef
Merge pull request #2 from Mailtrain-org/development 
Merge
 2019-08-08 11:41:17 +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
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