mailtrain

public/mailtrain

Fork 0

Commit graph

f5a09cd941 u Tomás Bianco 2020-02-22 20:24:08 -03:00
9e8a661b5a u Tomás Bianco 2020-02-22 20:22:40 -03:00
b6a642fa1e u Tomás Bianco 2020-02-22 20:18:39 -03:00
cb6e52366b u Tomás Bianco 2020-02-22 20:16:03 -03:00
f5d34a92e9 u Tomás Bianco 2020-02-22 20:12:58 -03:00
bf6787d09b u Tomás Bianco 2020-02-22 20:12:24 -03:00
8167a10edc u Tomás Bianco 2020-02-22 20:11:22 -03:00
6c72f4fce9 u Tomás Bianco 2020-02-22 20:10:21 -03:00
181ec42d7f update dependencies Tomás Bianco 2020-02-22 19:56:27 -03:00
f323033da7

Merge pull request #853 from SeesePlusPlus/docs/update-subscription-widget-docs Tomas Bures 2020-02-18 05:07:31 +01:00
5450a92f33 update docs for the subscription widget Mike Seese 2020-02-17 12:03:05 -08:00
4c3c455413 u Tomás Bianco 2020-02-04 10:40:08 -03:00
8b0cfe74aa u Tomás Bianco 2020-02-03 11:21:11 -03:00
c9f1028fef

Merge pull request #844 from taye/feat-more-docker-env-variables Tomas Bures 2020-02-03 10:15:40 +01:00
3e5bad703d u Tomás Bianco 2020-02-02 21:32:07 -03:00
2e139782f6 Expect port to be optionally included in URL_BASE_* docker env vars Taye Adeyemi 2020-02-03 01:29:36 +01:00
ba57f2cc85 u Tomás Bianco 2020-02-02 21:28:38 -03:00
5516bdac33 u Tomás Bianco 2020-02-02 21:23:11 -03:00
92dadd43a3 u Tomás Bianco 2020-02-02 21:09:11 -03:00
f110e7f87a u Tomás Bianco 2020-02-02 21:06:25 -03:00
0b2245adc9 u Tomás Bianco 2020-02-02 21:00:36 -03:00
572e1ee78b Use WITH_REDIS and WITH_ZONE_MTA env vars in docker-entrypoint.sh Taye Adeyemi 2020-02-02 17:43:06 +01:00
cf995fc35c Use PORT_{TRUSTED,SANDBOX,PUBLIC} env vars in docker-entrypoint.sh Taye Adeyemi 2020-02-02 17:22:18 +01:00
417b208bfe Use WWW_HOST and WWW_SECRET env vars in docker-entrypoint.sh Taye Adeyemi 2020-02-02 17:21:25 +01:00
f1cd83b734

Merge pull request #843 from taye/patch-1 Tomas Bures 2020-02-01 19:38:33 +01:00
92fe57f722

Fix typo when getting $MONGO_HOST env variable taye 2020-02-01 19:35:50 +01:00
8271d6675a Add API enpoints to create, delete and get lists. AndresMRM 2020-01-31 10:04:07 -03:00
010e4837bc

Merge pull request #840 from andresmrm/fix-server-config-recreation Tomas Bures 2020-01-31 12:32:16 +01:00
976d788b17 Fix path to server config file. AndresMRM 2020-01-30 16:07:59 -03:00
cdcc254294

Merge pull request #838 from andresmrm/patch-3 Tomas Bures 2020-01-25 14:22:55 +01:00
ecabc962ef

typo Andrés Martano 2020-01-25 12:54:19 +00:00
97a40033d6 Added "Sender" role to lists Tomas Bures 2020-01-16 21:30:55 +01:00
a3eaf72203 Updated dependencies Version updated Tomas Bures 2020-01-12 12:55:03 +01:00
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.) Tomas Bures 2020-01-12 12:07:14 +01:00
674399eb74 Merge remote-tracking branch 'origin/development' into development Tomas Bures 2020-01-12 09:32:05 +01:00
eb6afc1783 Merge of of PR #803 and some cleanup. Tomas Bures 2020-01-12 09:31:11 +01:00
ddd84656b8 Merge branch 'pull/803' into development Tomas Bures 2020-01-12 09:13:55 +01:00
c1091b9e42

Merge pull request #825 from dlecan/patch-1 Tomas Bures 2020-01-11 14:01:59 +01:00
7552c31d8d Merge remote-tracking branch 'origin/development' into development Tomas Bures 2020-01-11 14:01:14 +01:00
57907f9260 Merge of of PR #827 Tomas Bures 2020-01-11 13:59:59 +01:00
7482cb2ff0

Merge pull request #830 from GuillaumeRemyCSI/development Tomas Bures 2020-01-11 13:48:30 +01:00
2204bbe70c Fix missing tx refrence, https://github.com/Mailtrain-org/mailtrain/issues/811 Chris 2020-01-08 10:58:28 +13:00
94d3f4d725 Merge branch 'development-upstream' into Override-config Gerhard Sletten 2020-01-06 10:50:42 +01:00
d64ab48d66

Fix WWWW_PROXY typo in README Damien Lecan 2020-01-06 10:28:07 +01:00
3d61d205d7 Added LDAP parameters for docker entryoint : mailTag, nameTag and method + fixed typo in bindPassword ldap parameter Guillaume Rémy 2020-01-05 13:02:07 +01:00
9d4506977d Fixes #824 "ReferenceError: os is not defined" Tomas Bures 2020-01-03 14:30:44 +01:00
6f463b0b82 Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development Tomas Bures 2020-01-03 14:28:02 +01:00
d7d626cbc0 Addresses #785 "Allow segmentation by Subscription Status" Tomas Bures 2020-01-03 14:27:47 +01:00
a950d511ec

Merge pull request #823 from Kevinjil/feature/ZoneMTA-pool-name Tomas Bures 2019-12-31 14:38:56 +01:00
2733912dda Update documentation for ZoneMTA pool name addition. Kevin Jilissen 2019-12-31 12:58:05 +01:00
0e7a5dae82 Add possibility to set pool name for builtin ZoneMTA. Kevin Jilissen 2019-12-31 01:28:08 +01:00
d17251c9a2 If a message fail to be delivered by AWS SES check if retryable is set to false to abort new retries Gerhard Sletten 2019-12-19 14:35:34 +01:00
33efab6eea another syntax fixes Shamil Mingaliev 2019-12-13 17:10:11 +03:00
13315b8b72 [ST] syntax fixes Shamil Mingaliev 2019-12-13 16:32:17 +03:00
e55fa93d18 create ENCRYPTED_EMAIL and IV merge tags to use in unsubscribe link template Shamil Mingaliev 2019-12-13 16:08:14 +03:00
300f0977f6 Need to parse the fields settings to make the date-format available in parsing, and set sql_mode in docker to make dates work even if they are not strict mysql-dates Gerhard Sletten 2019-12-12 15:39:44 +01:00
7ccf751c5a Add a note in README.md about passing own env-vars to docker-compose Gerhard Sletten 2019-12-12 14:34:00 +01:00
2cae00315c Append to own production.yaml and remove log because level is default (and you will get an error if you try to override this in your own production.yaml Gerhard Sletten 2019-12-12 14:20:29 +01:00
b959bb0812 Set right indentions for merging with own server/config/production.yaml Gerhard Sletten 2019-12-12 14:19:06 +01:00
7744f5dc29

Merge pull request #801 from mhulet/patch-1 Tomas Bures 2019-12-09 21:29:34 +01:00
fd777e56b9

Replace WITH_PROXY with WWW_PROXY in README Michael Hulet 2019-12-09 21:24:42 +01:00
d340a803e1 Updated build info. Tomas Bures 2019-12-07 14:10:15 +01:00
e49630d4f0 Fixed warning about unsaved data when leaving empty campaign edit. Tomas Bures 2019-12-07 14:08:12 +01:00
3c4fbf2754 Merge branch 'pull/723' into development Tomas Bures 2019-12-07 13:56:49 +01:00
2b60af2605 Merge remote-tracking branch 'origin/development' into development Tomas Bures 2019-12-07 13:52:39 +01:00
0298a1dcbe Updated packages and fixed problems caused by the update. Tomas Bures 2019-12-07 13:51:59 +01:00
87b9399a5b Merge branch 'pull/722' into development Tomas Bures 2019-12-07 13:49:06 +01:00
cc34d89283

Merge pull request #679 from galaxycard/bugfix/missingMergeTags Tomas Bures 2019-12-07 11:59:29 +01:00
6d00ea1e69 Merged PR #724 Tomas Bures 2019-12-07 11:53:18 +01:00
52c638b0b3 Merge branch 'pull/724' into development Tomas Bures 2019-12-07 11:48:57 +01:00
7df580d7e2 Merged PR #740. Tomas Bures 2019-12-07 11:21:19 +01:00
e6b1cf8add Merge branch 'pull/740' into development Tomas Bures 2019-12-07 11:11:44 +01:00
964ff80cfa Merge branch 'pull/741' into development Tomas Bures 2019-12-07 10:49:23 +01:00
63a79ae36d Updated packages and fixed problems caused by the update. Tomas Bures 2019-12-07 10:47:57 +01:00
cd2fdb9e23 Updated packages. Merged #763 + some variable renaming Tomas Bures 2019-12-07 09:28:17 +01:00
e61e0fb802 Merge branch 'pull/763' into development Tomas Bures 2019-12-07 08:24:34 +01:00
4cdc4ed833

Merge pull request #789 from notz/fix-trigger-campaign-id Tomas Bures 2019-12-07 08:19:29 +01:00
c44ed4f7fa Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development Tomas Bures 2019-12-07 08:08:54 +01:00
e19d72ccfc

Merge pull request #792 from martialblog/image-size Tomas Bures 2019-12-07 08:07:17 +01:00
7e5440e389

Merge pull request #796 from andresmrm/patch-1 Tomas Bures 2019-12-07 08:06:18 +01:00
72cf153a90

Merge pull request #797 from andresmrm/patch-2 Tomas Bures 2019-12-07 08:05:48 +01:00
023dac88ab

typos Andrés Martano 2019-12-06 13:43:48 +00:00
595d1f3871

Fix default MYSQL_PASSWORD. Andrés Martano 2019-12-06 13:41:04 +00:00
43edf35637 Reduce Docker image size Markus Opolka 2019-12-05 12:00:07 +01:00
e2a69ef76d Added subscription changed trigger Gernot Pansy 2019-10-10 12:35:57 +02:00
1145bf36cf fix trigger campaign id Gernot Pansy 2019-12-03 08:56:12 +01:00
ed2655b78e

Merge pull request #773 from sedrubal/add-cid-to-get-lists-for-email-api-call Tomas Bures 2019-11-26 21:12:07 +01:00
6bacde9e3d

Merge pull request #783 from martialblog/refactor-entrypoint Tomas Bures 2019-11-26 21:11:06 +01:00
668c98477e Update README and docker-compose files for new entrypoint Markus Opolka 2019-11-21 14:29:24 +01:00
b21005df78 Refactor docker-entrypoint.sh to use ENV Variables Markus Opolka 2019-11-21 14:09:34 +01:00
0970de7365

Merge pull request #772 from sedrubal/fix-access-token-in-documentation Tomas Bures 2019-11-20 11:57:37 +01:00
7c5896b0c9 Replace void tag by full tag when loading the doc Dominique Da Silva 2019-11-17 15:28:10 +00:00
87e1f4528a

Merge pull request #781 from martialblog/enhance-german-translation Tomas Bures 2019-11-17 08:53:55 +01:00
fb1e6525f4 Added support for resizing retina images. Dominique Da Silva 2019-11-16 12:29:03 +00:00
c50881c098 Added verif to img resizing and stats in grapesjs Dominique Da Silva 2019-11-15 18:03:07 +00:00
988ab57929 Added list id (lcid) and serviceUrl on web notices Dominique Da Silva 2019-11-14 12:01:27 +00:00
6bf0a3c818 Added geoip.datadirectory to reports defaults Dominique Da Silva 2019-11-14 12:00:37 +00:00
5ffdfa7c96

Fix some typos in German translation sedrubal 2019-11-14 02:05:03 +01:00
5097fee52c Typo correction Dominique Da Silva 2019-11-13 18:10:01 +00:00
8a412562f2 Lists: Search in custom fields and status filter. Dominique Da Silva 2019-11-13 18:09:42 +00:00