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

1173 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damien Lecan
d64ab48d66
Fix WWWW_PROXY typo in README 2020-01-06 10:28:07 +01: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
Tomas Bures
a950d511ec
Merge pull request #823 from Kevinjil/feature/ZoneMTA-pool-name 
Add possibility to set pool name for builtin ZoneMTA.
 2019-12-31 14:38:56 +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
7744f5dc29
Merge pull request #801 from mhulet/patch-1 
Replace WITH_PROXY with WWW_PROXY in README
 2019-12-09 21:29:34 +01:00
Michael Hulet
fd777e56b9
Replace WITH_PROXY with WWW_PROXY in README 
The expected environment variable is WWW_PROXY, not WITH_PROXY
 2019-12-09 21:24:42 +01:00
Tomas Bures
d340a803e1 Updated build info. 2019-12-07 14:10:15 +01:00
Tomas Bures
e49630d4f0 Fixed warning about unsaved data when leaving empty campaign edit. 2019-12-07 14:08:12 +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
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