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

1202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tomas Bures
f323033da7
Merge pull request #853 from SeesePlusPlus/docs/update-subscription-widget-docs 
Update subscription widget docs
 2020-02-18 05:07:31 +01:00
Mike Seese
5450a92f33 update docs for the subscription widget 2020-02-17 12:03:05 -08:00
Tomas Bures
c9f1028fef
Merge pull request #844 from taye/feat-more-docker-env-variables 
Set more config options from docker-entrypoint.sh
 2020-02-03 10:15:40 +01:00
Taye Adeyemi
2e139782f6 Expect port to be optionally included in URL_BASE_* docker env vars 2020-02-03 01:31:49 +01:00
Taye Adeyemi
572e1ee78b Use WITH_REDIS and WITH_ZONE_MTA env vars in docker-entrypoint.sh 2020-02-02 19:33:58 +01:00
Taye Adeyemi
cf995fc35c Use PORT_{TRUSTED,SANDBOX,PUBLIC} env vars in docker-entrypoint.sh 2020-02-02 19:33:54 +01:00
Taye Adeyemi
417b208bfe Use WWW_HOST and WWW_SECRET env vars in docker-entrypoint.sh 2020-02-02 19:32:36 +01:00
Tomas Bures
f1cd83b734
Merge pull request #843 from taye/patch-1 
Fix typo when getting $MONGO_HOST env variable
 2020-02-01 19:38:33 +01:00
taye
92fe57f722
Fix typo when getting $MONGO_HOST env variable 2020-02-01 19:35:50 +01:00
Tomas Bures
010e4837bc
Merge pull request #840 from andresmrm/fix-server-config-recreation 
Fix path to server config file.
 2020-01-31 12:32:16 +01:00
AndresMRM
976d788b17 Fix path to server config file. 2020-01-30 16:07:59 -03:00
Tomas Bures
cdcc254294
Merge pull request #838 from andresmrm/patch-3 
fix endpoint /api/blacklist/delete
 2020-01-25 14:22:55 +01:00
Andrés Martano
ecabc962ef
typo 2020-01-25 12:54:19 +00:00
Tomas Bures
97a40033d6 Added "Sender" role to lists 2020-01-16 21:30:55 +01:00
Tomas Bures
a3eaf72203 Updated dependencies 
Version updated
 2020-01-12 12:55:03 +01:00
Tomas Bures
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.) 
Campaigns list is now by default ordered by 'Created' in descending order.

Fixed display bug - two clicks on main menu item made it disappear

Campaign Status is now protected by 'view' permission. (Up till now it was 'viewStats' permission.)

Fixes in campaign status to hide send buttons and test send button if a user does not have necessary permissions.

Templates, Mosaico templates and Campaigns (edit and content) are now displayed to user even if the user does have only 'view' permission (not 'edit'). A banner is displayed that the user cannot save any changes and buttons are removed from the edit pages. This is to allow users to copy settings and content from existing campaigns which they are not supposed to edit. A better solution would be to display the edit and content form in read-only mode, but this seems to be a bit complicated.
 2020-01-12 12:07:14 +01:00
Tomas Bures
674399eb74 Merge remote-tracking branch 'origin/development' into development 
# Conflicts:
#	README.md
 2020-01-12 09:32:05 +01:00
Tomas Bures
eb6afc1783 Merge of of PR #803 and some cleanup. 2020-01-12 09:31:11 +01:00
Tomas Bures
ddd84656b8 Merge branch 'pull/803' into development 
# Conflicts:
#	docker-entrypoint.sh
 2020-01-12 09:13:55 +01:00
Tomas Bures
c1091b9e42
Merge pull request #825 from dlecan/patch-1 
Fix WWWW_PROXY typo in README
 2020-01-11 14:01:59 +01:00
Tomas Bures
7552c31d8d Merge remote-tracking branch 'origin/development' into development 2020-01-11 14:01:14 +01:00
Tomas Bures
57907f9260 Merge of of PR #827 2020-01-11 13:59:59 +01:00
Tomas Bures
7482cb2ff0
Merge pull request #830 from GuillaumeRemyCSI/development 
[READY] Added LDAP parameters for docker entryoint : mailTag, nameTag and method
 2020-01-11 13:48:30 +01:00
Chris
2204bbe70c Fix missing tx refrence, https://github.com/Mailtrain-org/mailtrain/issues/811 2020-01-08 10:58:28 +13:00
Gerhard Sletten
94d3f4d725 Merge branch 'development-upstream' into Override-config 
# Conflicts:
#	docker-entrypoint.sh
 2020-01-06 10:50:42 +01:00
Damien Lecan
d64ab48d66
Fix WWWW_PROXY typo in README 2020-01-06 10:28:07 +01:00
Guillaume Rémy
3d61d205d7 Added LDAP parameters for docker entryoint : mailTag, nameTag and method + fixed typo in bindPassword ldap parameter 2020-01-05 13:02: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
Gerhard Sletten
7ccf751c5a Add a note in README.md about passing own env-vars to docker-compose 2019-12-12 14:34:00 +01:00
Gerhard Sletten
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 2019-12-12 14:20:29 +01:00
Gerhard Sletten
b959bb0812 Set right indentions for merging with own server/config/production.yaml 2019-12-12 14:19:06 +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