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

1259 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tomas Bures
87b9399a5b Merge branch 'pull/722' into development 2019-12-07 13:49:06 +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
Tomas Bures
c44ed4f7fa Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development 2019-12-07 08:08:54 +01:00
Tomas Bures
e19d72ccfc
Merge pull request #792 from martialblog/image-size 
Reduce Docker image size
 2019-12-07 08:07:17 +01:00
Tomas Bures
7e5440e389
Merge pull request #796 from andresmrm/patch-1 
Fix default MYSQL_PASSWORD.
 2019-12-07 08:06:18 +01:00
Tomas Bures
72cf153a90
Merge pull request #797 from andresmrm/patch-2 
typos
 2019-12-07 08:05:48 +01:00
Andrés Martano
023dac88ab
typos 2019-12-06 13:43:48 +00:00
Andrés Martano
595d1f3871
Fix default MYSQL_PASSWORD. 2019-12-06 13:41:04 +00: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
Tomas Bures
6bacde9e3d
Merge pull request #783 from martialblog/refactor-entrypoint 
Refactor Docker entrypoint
 2019-11-26 21:11:06 +01:00
Markus Opolka
668c98477e Update README and docker-compose files for new entrypoint 
- Removed MAILTRAIN_SETTING command
 - Added list of Environment Variables to README
 2019-11-22 11:20:10 +01:00
Markus Opolka
b21005df78 Refactor docker-entrypoint.sh to use ENV Variables 
- This provides a setup which is more consistens with other Docker images
 - Provides the possibility to deploy configuration files with configuration management tool
 - Throws an error when the MAILTRAIN_SETTINGS is still used
 2019-11-22 11:20:10 +01:00
Tomas Bures
0970de7365
Merge pull request #772 from sedrubal/fix-access-token-in-documentation 
Fix rendering of access token in API docs
 2019-11-20 11:57:37 +01:00
Tomas Bures
87e1f4528a
Merge pull request #781 from martialblog/enhance-german-translation 
Fix some typos in German translation
 2019-11-17 08:53:55 +01:00
sedrubal
5ffdfa7c96
Fix some typos in German translation 2019-11-14 02:05:03 +01:00
Tomas Bures
7558178bf4
Merge pull request #777 from martialblog/de-DE 
Add German Translation for Mailtrain v2
 2019-11-13 11:23:42 +02:00
Markus Opolka
aa1baae5b5 Add German Translation for Mailtrain v2 2019-11-13 10:15:45 +01:00
Markus Opolka
10dcfeb749 Add locales key for 'Help text' 2019-11-13 10:15:45 +01:00
Markus Opolka
1ed90941a7 Add locales key for 'Tag language' 2019-11-13 10:15:45 +01:00
Markus Opolka
adbee1cc22 Fix minor typo in english translation 2019-11-13 10:15:45 +01:00
Markus Opolka
73b49e7922 Fix minor typo in english translation 2019-11-13 10:15:45 +01:00
Tomas Bures
97910a2efa
Merge pull request #775 from ericuldall/fix-multiple-campaign-error 
Fixes issue sending multiple campaigns
 2019-11-12 23:31:34 +02: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
sedrubal
81fb4be4af
Delete trailing &s in API docs 2019-11-10 00:28:29 +01:00
sedrubal
436e8b069d
Fix rendering of access token in API docs 2019-11-10 00:23:18 +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
Tomas Bures
3a2d1512ab
Merge pull request #739 from martialblog/fix-posix-resolve 
Add Python to Dockerfile package installation
 2019-10-20 00:18:34 +03:00
Markus Opolka
c9563ede6a Add python to Dockerfile 
- This ensures that the posix pid/gid resolve features are working
 2019-10-19 13:23:01 +02:00
Gernot Pansy
fe39ec5134 Send triggered campaigns only to active subscribers 2019-10-10 12:37:31 +02:00
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