Brenton Durkee
0cbec006b4
Adds duplicate button to Template edit form.
...
Adds duplicate model function for Template that gets a Template by id
and creates a new Template with the same data.
2017-10-16 11:29:57 -04:00
Roger Witzig
b30a9f2e41
Merge pull request #341 from MelwinKfr/patch-1
...
add: LDAP options `bindUser` and `bindPassword`
2017-10-11 13:34:31 +02:00
Melwin Kieffer
cf38aea80b
doc: bindUser and binPassword LDAP options
2017-10-11 12:11:45 +02:00
Melwin Kieffer
65923c0c05
add: LDAP options bindUser and bindPassword
...
To be able to use a different user for bind requests,
which can be required by some LDAP security strategy.
2017-10-10 16:30:40 +02:00
witzig
0a369e2475
Fix grouped custom fields not saving deselected values #333
2017-10-05 13:39:53 +02:00
witzig
6e3b9d209c
Fix import type display
2017-10-01 21:36:11 +02:00
witzig
615ed5a693
Support multiple usage of RSS merge tags, closes #329
2017-09-29 12:22:37 +02:00
witzig
46acece89c
Improve CSV import error handling, closes #324
2017-09-29 00:32:00 +02:00
Roger Witzig
b406870756
Merge pull request #326 from witzig/list-import
2017-09-29 00:26:55 +02:00
witzig
83e62e990b
Update import.hbs
2017-09-29 00:19:19 +02:00
witzig
ebac58e686
Add comment
2017-09-29 00:13:32 +02:00
witzig
f4375e9da9
Update import type display
2017-09-28 01:34:34 +02:00
witzig
c5b481a266
Add option to preserve unsubscribed status on list import, #325
2017-09-28 00:55:19 +02:00
witzig
5ada25c2dc
Fix error checking, #324
2017-09-27 19:27:01 +02:00
Roger Witzig
6e51a074d6
Merge pull request #322 from programster/dockerfile-node-bump
...
Bumping the dockerfile baseimage from node 8.1 to 8.6
2017-09-27 10:17:10 +02:00
Programster
8bd9b5bc9e
* Undoing my change of swapping out the mailtrain title with the logo because it looks wierd as the logo has too much whitespace.
...
* Adding the information about Node js version requirement to the manual installation instructions.
2017-09-27 02:13:11 +00:00
Programster
286434d846
Trying to slim down the front README page. If user's need more detailed information, such as how to deploy on Rancher, they should read the docs area.
2017-09-27 02:03:34 +00:00
Programster
2d96566b07
Moving the majority of the documentation from the README file to the documents area and referencing it.
2017-09-27 01:55:19 +00:00
Programster
66fa5e1e32
Bumping the dockerfile baseimage from node 8.1 to 8.6
2017-09-27 01:21:44 +00:00
witzig
c7c972d1d5
Bump deps
...
- mjml comment bug has been fixed in 3.3.5
- csv-generate is no longer required since v1.19.1
- escape-string-regexp added to dependencies
- bluebird and lodash added to dev-dependencies
2017-09-26 14:10:16 +02:00
witzig
e669b5684e
Fixed MJML Dependency (temporary)
2017-09-22 16:20:14 +02:00
witzig
f96b9de510
Bumped some deps
...
Note: isemail 3.x, jsdom 11.x, and mjml 3.3.4 contain breaking changes
2017-09-22 15:28:26 +02:00
witzig
8e1bc1df7a
Fixes #298 - Import CSV didn't show hidden custom fields
2017-09-22 14:26:47 +02:00
Roger Witzig
d840b2a88b
Merge pull request #317 from mystvearn147/patch-1
...
add package-lock.json file to gitignore
2017-09-22 11:46:36 +02:00
witzig
544e221278
Honour tracking settings from parent RSS-Campaign, fixes #319
2017-09-22 11:39:01 +02:00
Passakorn Suppakityothin
f66416ad65
add package-lock.json file to gitignore
2017-09-20 11:59:23 +07:00
witzig
92fe9121f1
Fixed incompatibility with the ZoneMTA DKIM Plugin
...
https://github.com/zone-eu/zone-mta/issues/93
2017-09-19 11:50:03 +02:00
wotomg
1e7ca17cb6
Update install.sh
...
Some fixes. Anyway, scripts does not work.
2017-09-18 14:44:03 +03:00
witzig
d9fe2e4eda
Added note about mysql timezone option. #311 #134
2017-09-15 22:17:54 +02:00
Andris Reinman
6aec53d882
Merge pull request #305 from theyough/master
...
Fix when postfix server does not send 'queue as' properly
2017-09-06 13:01:59 +03:00
theyough
b663de138e
Fix Travis: Missing semicolon
2017-09-06 10:14:25 +01:00
theyough
332666c851
Fix when postfix server does not send 'queue as' properly
2017-09-06 00:45:27 +01:00
theyough
4235a9b984
Fix when postfix server does not send 'queue as' properly
2017-09-06 00:33:29 +01:00
theyough
dd637a1f2b
Fix when postfix server does not send 'queue as' properly
2017-09-05 23:22:39 +01:00
Andris Reinman
da6aa7f6b5
Create CNAME
2017-08-28 15:37:26 +03:00
Andris Reinman
c91d1d0296
Create README.md
2017-08-28 15:36:15 +03:00
Andris Reinman
102a437aed
Merge pull request #293 from killua-eu/master
...
Improving DKIM/SPF/DMARC/PTR documentation
2017-08-14 10:57:33 +03:00
killua-eu
0876b8029e
Update README.md
2017-08-14 09:47:08 +02:00
Roger Witzig
3088a20c03
Merge pull request #282 from FWirtz/patch-1
...
Fix docker install instructions
2017-07-21 17:05:57 +02:00
Florian
98ab33ccfe
Fix docker install instructions
...
Change extension name of copied docker-
compose-override file to not be the same
as source
2017-07-21 15:47:10 +02:00
witzig
4cede37e9d
Fixes #278
...
Although the bounced counter is correctly increased, the status of
failed messages has been set to 'unsubscribed' instead of 'bounced‘.
2017-07-14 23:48:18 +02:00
witzig
b57615543b
Fixed Travis CI Checks
...
Travis CI didn’t install the latest 7.x release somehow. Testing with
8.x henceforth.
2017-07-13 22:45:35 +02:00
witzig
ce2ed26fc9
findMailByResponse now searches in latest campaigns first
...
This should be more efficient especially if there’re many campaigns.
2017-07-13 22:29:55 +02:00
Andris Reinman
091c00a218
Merge pull request #269 from losacno/master
...
Check for locally requeued messages in postfix
2017-07-10 18:22:04 +03:00
Luc LosCan
3ab718705e
Removed 127.0.0.1 from queued .test()
2017-07-10 17:14:36 +02:00
Luc LosCan
3e04f82fe2
Fix Travis CI checks
2017-07-10 12:22:01 +02:00
Luc LosCan
f90e67d775
Save new queueId/response on locally requeued messages
2017-07-10 12:13:17 +02:00
witzig
bd570000e1
Added documentation for API endpoint /api/field/:listId
...
This has accidentally been removed with PR #203 .
2017-07-06 15:08:35 +02:00
Roger Witzig
622a23959b
Merge pull request #274 from Roost/master
...
Fixed an issue where API dates were not correctly being triggered. #273
2017-07-04 00:54:44 +02:00
Bruce Mackintosh
191dc7b541
Changed the trigger treshold value from 6 hours to 24 hours, so that dates stored via the API as 00:00:00 are correctly picked up and added to the queue.
2017-07-03 19:44:45 +01:00
