witzig
|
9c2444488f
|
Satisfy ESLint no-unused-vars
|
2017-04-02 14:00:42 +02:00 |
|
Andris Reinman
|
f234a64df7
|
Merge pull request #187 from larrabee/disable_email_check
Add option to disable email cheking for imported CSV
|
2017-03-31 13:43:08 +03:00 |
|
vladimir
|
3b39f619b1
|
Small visual change in device/country charts
|
2017-03-31 11:51:26 +02:00 |
|
vladimir
|
1547e887c3
|
Add option to disable email cheking for imported CSV
|
2017-03-31 11:20:43 +02:00 |
|
Andris Reinman
|
d7c06e0a5a
|
Do not use .stack property with error objects
|
2017-03-24 13:04:38 +02:00 |
|
Andris Reinman
|
179e0d5ab3
|
fixed thrown errors
|
2017-03-21 10:39:44 +02:00 |
|
vladimir
|
3152ecb228
|
Merge remote-tracking branch 'upstream/master' into clicks-by-device-type
|
2017-03-21 10:26:50 +02:00 |
|
Andris Reinman
|
979321ea98
|
Merge pull request #180 from witzig/custom-forms-mjml
Custom forms mjml
|
2017-03-21 09:54:59 +02:00 |
|
vladimir
|
8caf334fcc
|
Cosmetic changes
|
2017-03-21 01:06:05 +02:00 |
|
witzig
|
0b0929aa7b
|
Some code formatting
|
2017-03-20 21:40:21 +01:00 |
|
witzig
|
f2b7d4c8df
|
Removed data keys from table custom_forms
|
2017-03-20 21:25:41 +01:00 |
|
witzig
|
c3ee53bd4b
|
Refactored Custom Form Table Structure
|
2017-03-20 19:37:09 +01:00 |
|
vladimir
|
10dd23fee4
|
Merge remote-tracking branch 'upstream/master' into clicks-by-device-type
|
2017-03-20 14:50:10 +02:00 |
|
vladimir
|
1ba3bce6eb
|
Add device type detect and stats calculation for open/click rate by device type and country
|
2017-03-20 14:44:17 +02:00 |
|
witzig
|
477aff95d5
|
Moved scripts out of layout.mjml.hbs
|
2017-03-19 16:14:31 +01:00 |
|
witzig
|
91addb14af
|
Satisfy ESLint indentation rule
|
2017-03-19 16:03:11 +01:00 |
|
witzig
|
adf4be7836
|
Fixed security issue where custom form description tags were able to include script tags
|
2017-03-19 15:53:41 +01:00 |
|
witzig
|
b09af60fac
|
Merge branch 'master' into custom-forms-mjml
# Conflicts:
# lib/tools.js
# package.json
|
2017-03-19 13:44:24 +01:00 |
|
witzig
|
2e50fbc8ae
|
Custom Forms
|
2017-03-19 13:36:57 +01:00 |
|
Andris Reinman
|
ae6affda81
|
do not allow script tags in description html
|
2017-03-19 14:22:44 +02:00 |
|
Andris Reinman
|
0879fa412a
|
force template html as html code, not an url or file path
ensure that external resources are not loaded by jsdom
|
2017-03-19 14:13:01 +02:00 |
|
Andris Reinman
|
9d5fb816c9
|
Fixes issue with HTML entities
|
2017-03-19 13:39:34 +02:00 |
|
vladimir
|
b6497b0e86
|
Fix logging for ldap module
|
2017-03-15 20:45:21 +02:00 |
|
vladimir
|
1ca27b6b40
|
Remove passport-ldapjs from packpage.json and add warning message
|
2017-03-15 20:26:54 +02:00 |
|
vladimir
|
2e5def404f
|
[bugfix] Fix LDAP issue with OpenLDAP/MS AD
|
2017-03-15 19:10:00 +02:00 |
|
Andris Reinman
|
020a77c78f
|
applied some code style changes
|
2017-03-10 14:14:38 +02:00 |
|
witzig
|
588eed008b
|
GrapeJS and Mosaico Integration
|
2017-03-10 09:59:25 +01:00 |
|
Andris Reinman
|
ab6ed1e505
|
Ensure ordering for custom fields
|
2017-03-08 19:07:51 +02:00 |
|
Andris Reinman
|
37531f2550
|
Merge branch 'master' of github.com:andris9/mailtrain
|
2017-03-07 16:31:34 +02:00 |
|
Andris Reinman
|
d25565b6f8
|
Updated translation support
|
2017-03-07 16:30:56 +02:00 |
|
witzig
|
a164a7fb40
|
Moved tracking scripts to partial and made tools.formatMessage() less greedy
The change in tools.formatMessage() prevents stripping CSS like
a[data-foo] and arrays in JS. Thus only replacing mergeTag it knows
about.
|
2017-03-06 14:52:22 +01:00 |
|
witzig
|
28c08cf847
|
Update helpers.js
|
2017-03-04 22:04:13 +01:00 |
|
witzig
|
8fdb2840c4
|
Moved Merge Tag Helpers to helpers.js
… to satisfy ESLint top-level module scope.
|
2017-03-04 21:50:44 +01:00 |
|
witzig
|
d9c1d8e595
|
Merge remote-tracking branch 'upstream/master'
|
2017-03-04 18:38:44 +01:00 |
|
witzig
|
633463108e
|
Merge tag reference abstraction/partial
Perhaps helpers.js would be a more suitable place for
getDefaultMergeTags() and getListMergeTags() … ?
|
2017-03-04 18:37:41 +01:00 |
|
Andris Reinman
|
ba8bd12123
|
initial translations support
|
2017-03-04 18:15:16 +02:00 |
|
witzig
|
a11d95f3d7
|
Support for custom HTML editors
|
2017-03-02 19:30:40 +01:00 |
|
Andris Reinman
|
66bfcebd47
|
added support for ses
|
2017-02-17 15:56:55 +02:00 |
|
Andris Reinman
|
9778c486e9
|
Allow international formatted dates in CSV imports
|
2017-02-02 16:47:50 +02:00 |
|
Andris Reinman
|
441b121b99
|
allow using only text content
|
2017-01-29 18:29:50 +02:00 |
|
Andris Reinman
|
59c7e1dd8b
|
allow using only text content
|
2017-01-29 18:23:00 +02:00 |
|
Andris Reinman
|
50f6c8d101
|
Reload mailer config once admin updates Mailtrain settings
|
2016-12-25 17:59:50 +02:00 |
|
Andris Reinman
|
8ca1fbb535
|
Added option to spawn multiple sender processes
|
2016-12-11 00:38:54 +02:00 |
|
Andris Reinman
|
37b0ac9aec
|
Do not use array.includes to support some older versions of node
|
2016-12-08 13:49:31 +02:00 |
|
Andris Reinman
|
170b60f9a0
|
Added option to set default options for nodemailer
|
2016-12-07 21:39:36 +02:00 |
|
Andris Reinman
|
57c6e0ae79
|
check if the new address is not already used
|
2016-12-07 16:21:22 +02:00 |
|
Andris Reinman
|
7fce6e28fa
|
Allow updating subscribers email address
|
2016-12-07 16:12:26 +02:00 |
|
Johannes Zellner
|
901591dde4
|
Ensure the campaigns model picks up reply_to
|
2016-11-25 17:10:44 +01:00 |
|
Andris Reinman
|
8d2e5f23e6
|
fixed campaign error
|
2016-11-13 13:50:51 +02:00 |
|
Andris Reinman
|
bd20e16d73
|
v1.19.1
|
2016-09-15 10:06:19 +03:00 |
|