Sebastián Ramírez
58f607ffc4
Add to .gitignore files that should not be commited
2017-06-24 18:32:29 -05:00
Sebastián Ramírez
fb3d37cfc0
Update README
2017-06-24 18:31:57 -05:00
Sebastián Ramírez
5229f6edaf
Add volume for reports
2017-06-24 18:22:38 -05:00
Sebastián Ramírez
fb6b98a618
Make docker-compose.override.yml a template
2017-06-24 18:20:15 -05:00
Sebastián Ramírez
31565f4cab
Add node_modules to .dockerignore to avoid unneeded building time / overhead
2017-06-24 18:17:34 -05:00
Sebastián Ramírez
54f65c506e
Update Dockerfile, order installs, NODE_ENV, add entrypoint
2017-06-24 18:17:00 -05:00
Sebastián Ramírez
f142175917
Add entrypoint that copies production configs
2017-06-24 18:15:52 -05:00
Sebastián Ramírez
1ff4676811
Update Docker config template
2017-06-24 18:14:54 -05:00
Roger Witzig
2e224ea057
Merge pull request #264 from Mailtrain-org/afanjul-spanish-translation
...
Added spanish es_ES translations
2017-06-23 23:07:18 +02:00
Francisco Lapuente
60c446b910
Added spanish es_ES translations
2017-06-23 22:57:48 +02:00
witzig
8b74730d08
Fixed remaining eslint errors for services/**/*.js
2017-06-22 18:29:42 +02:00
witzig
c7ba0235c5
Satisfy eslint rule indent
2017-06-22 18:25:13 +02:00
witzig
44ab04624b
Satisfy eslint rule linebreak-style
2017-06-22 18:25:13 +02:00
witzig
f73eb026b6
Fixed possible bug: callback called twice
2017-06-22 18:16:26 +02:00
witzig
963aef53b5
Don't close the VERP Server on error. And improved error reporting.
...
Based on https://git.io/vQLS7 , I believe the change introduced in
https://git.io/vQL7u "server.close()" to be in error, and intended to
close one connection, like it’s handled in https://git.io/vQLSF
Perhaps SMTPServer isn't even meant to throw ECONNRESET and EPIPE in
the first place.
2017-06-22 18:00:13 +02:00
witzig
277b2cadf5
Fixed bug #261
2017-06-21 17:28:56 +02:00
witzig
2b2bda0944
Fixed/reverted Mosaico social icons
...
Note: The 404’s logged by Mosaico are ‚normal‘ as it tries the relative
path before resolving the URL based on the template directory.
2017-06-20 21:27:51 +02:00
witzig
3c4558d70c
Refactored and linted editorapi image handling
2017-06-20 19:08:14 +02:00
Andris Reinman
ac63e934ec
Merge pull request #259 from Mailtrain-org/remove_ads
...
Removed ads from code
2017-06-20 16:53:22 +03:00
Andris Reinman
8b900a9c44
Removed ads from code
2017-06-20 16:47:25 +03:00
witzig
5647dd040d
Updated subscription-mail-helper.js - Don't wait for mailer to finish.
...
Note: When using encryptionKeys, confirmation redirects feel a bit
sluggish. This could probably be 'improved' by calling sendMail via
setTimout or fixed by moving sendMail to a worker.
2017-06-16 14:28:57 +02:00
witzig
a2ebe8f0f7
Fixed mail-helper.js not calling back when disableConfirmations = true
...
And some refactoring
2017-06-16 02:13:21 +02:00
witzig
830ca4f17f
Satisfy eslint rule no-useless-escape
2017-06-15 21:44:54 +02:00
witzig
80aca59af7
Disable eslint rule no-await-in-loop for e2e tests
2017-06-15 21:28:40 +02:00
witzig
2da90b58e4
Satisfy new eslint indentation rule
2017-06-15 21:26:35 +02:00
witzig
1db7bd9873
Bumped deps
2017-06-15 21:23:35 +02:00
Sebastián Ramírez
5e5e5c70bf
Update README to include new docker-compose instructions
2017-06-15 13:00:17 -05:00
Sebastián Ramírez
274c706f02
Add restart: always to docker-compose.override.yml
2017-06-15 13:00:00 -05:00
Sebastián Ramírez
2cf2cc71ff
Update mailtrain tag name
2017-06-15 12:59:42 -05:00
witzig
4f5c132db4
Fixed bug: Hidden custom fields (for custom forms) losing values when updating preferences.
...
Credits to @flapuente-palbin
2017-06-15 19:11:13 +02:00
Sebastián Ramírez
ca096d191f
Add base docker-compose and override to build image and set ports
2017-06-15 11:21:22 -05:00
Sebastián Ramírez
82a1aec72a
Add docker.toml with configs compatible with docker-compose
2017-06-15 11:20:56 -05:00
Sebastián Ramírez
61f37062cb
Update Dockerfile to be based on the standard NodeJS image
2017-06-15 10:56:30 -05:00
witzig
1d76eefe27
Fixed unhandled promise rejection #254 (and some cleanup)
2017-06-14 11:07:16 +02:00
witzig
0629194f56
Updated e2e subscription tests
...
Added test for bug #249
Extended tests for custom fields (work in progress)
2017-06-11 18:49:02 +02:00
witzig
87f7a050ab
Fixed bug #249
2017-06-11 01:27:27 +02:00
Roger Witzig
7d978c4df1
Merge pull request #251 from jablkopp/bug-fix
...
Fix typo during refactoring
2017-06-08 14:45:36 +02:00
Krzysztof Jablonski
71ac4c64a5
Avoid using > with „enums”
2017-06-08 14:22:34 +02:00
Krzysztof Jablonski
819fcfb392
Fix typo during refactoring
...
During code refactoring for selectable
unsubscription feature code:
`!campaignId || status > 2` was wrongly refactored
to:
`subscription.status !== Status.SUBSCRIBED`
Link:
a6d25e668b (diff-5af9fe5dfae76c093530c92e3d7404e1R496)
2017-06-08 14:06:35 +02:00
witzig
5aa6dff743
Fixed HTML templates for custom JSON fields #192
2017-06-03 00:13:03 +02:00
witzig
cec227d688
Fixed Merge Tags for custom date fields
2017-06-02 03:05:19 +02:00
witzig
466bf225a3
Fixed Merge Tags #206 #236
2017-06-02 00:24:26 +02:00
witzig
6d39d497ee
Added e2e test for #222
2017-06-01 18:06:25 +02:00
Tomas Bures
6f554038c9
Merge branch 'master' of github.com:Mailtrain-org/mailtrain
2017-06-01 08:04:56 -04:00
Tomas Bures
8c5b62b6a4
Fixed bug #246 .
2017-06-01 08:03:43 -04:00
witzig
cff908887f
Fixed throttling and pausing #243
2017-06-01 13:08:45 +02:00
witzig
a7b2c33b30
GrapeJS MJML Integration (Experimental)
...
#215
2017-05-31 02:08:44 +02:00
witzig
ae2b07b222
GrapeJS MJML Template Aves
2017-05-31 02:00:12 +02:00
witzig
0f91533210
GrapeJS v0.5.41
...
GrapesJS Preset Newsletter v0.2.3
GrapeJS MJML v0.0.7
...
2017-05-31 01:45:56 +02:00
Roger Witzig
ccd48fe36e
Merge pull request #242 from witzig/travis
...
Basic Travis CI integration
2017-05-29 09:34:29 +02:00
