Commit graph

107 commits

Author SHA1 Message Date
Adrian
4dd754ff82
add passport-ldapauth to dependencies
when "npm install --production" is called, every time, passport-ldapauth is removed from local repository, with adding the dependency to package.json, the behavior is as expected (see production.yml config for ldap config)
2018-08-07 08:41:13 +02:00
Jonas Düver
80f2fe1b26 Bump version 2018-04-25 18:18:36 +02: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
3c4558d70c Refactored and linted editorapi image handling 2017-06-20 19:08:14 +02:00
witzig
1db7bd9873 Bumped deps 2017-06-15 21:23:35 +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
cec227d688 Fixed Merge Tags for custom date fields 2017-06-02 03:05:19 +02:00
Tomas Bures
e78c64ed13 Merge branch 'master' of github.com:Mailtrain-org/mailtrain 2017-05-27 00:07:18 +02:00
witzig
fdb6075788 Fixed mailparser dependency (#237) 2017-05-25 10:56:32 +02:00
Tomas Bures
ccd37ac792 Polishing e2e test API. Added option to parse links and extract parameters from them. Added option to construct parameterizedlinks in "navigate". 2017-05-23 19:34:01 +02:00
Tomas Bures
328034bae0 Half way in improving e2e test infrastructure and refactoring tests to the enhanced (un)subscription process 2017-05-23 04:15:32 +02:00
witzig
43e1cab315 Updated readme and added install script 2017-05-16 02:47:35 +02:00
witzig
6c35046ab2 e2e tests (draft) 2017-05-10 01:40:02 +02:00
root
2ac89f3365 Report processor worker refactored to run under another user (nobody) and have its own mysql credentials. 2017-04-27 16:35:53 -04:00
Tomas Bures
418dba7b9f Work in progress on securing reports. 2017-04-25 22:49:31 +00:00
Andris Reinman
4ca98dd437 v1.23.2 2017-04-04 12:40:06 +03:00
witzig
60907c0d86 Subscription Widget 2017-04-03 20:42:04 +02:00
Andris Reinman
2df265009c v1.23.1 2017-03-26 14:01:17 +03:00
Andris Reinman
47705c212d Replaced andris9 with Mailtrain-org 2017-03-23 15:47:00 +02:00
Andris Reinman
6f95474155 Removed mailtrain.pot catalogue file. Generate it every time freshly when updating PO file 2017-03-23 11:15:01 +02:00
witzig
1564ca07cc Freeze MJML dependency 2017-03-21 12:00:42 +01:00
Andris Reinman
1e9c9f3275 Merge branch 'clicks-by-device-type' of https://github.com/larrabee/mailtrain into larrabee-clicks-by-device-type 2017-03-21 10:29:00 +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
6b87a9711f fixed conflicts 2017-03-21 10:16:42 +02:00
Andris Reinman
b63af2549b bumped some deps 2017-03-21 10:14:39 +02: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
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
77aded3125 v1.23.0 2017-03-19 14:29:34 +02:00
Andris Reinman
ae6affda81 do not allow script tags in description html 2017-03-19 14:22:44 +02:00
Andris Reinman
9d5fb816c9 Fixes issue with HTML entities 2017-03-19 13:39:34 +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
witzig
ed6d3011f3 Enabled GrapeJS and Mosaico 2017-03-10 10:00:42 +01:00
Andris Reinman
6ef9836c14 bumped deps 2017-03-08 18:37:50 +02:00
Andris Reinman
d25565b6f8 Updated translation support 2017-03-07 16:30:56 +02:00
Andris Reinman
89f480d5f8 fixed dependencies 2017-03-06 10:48:08 +02:00
Andris Reinman
ba8bd12123 initial translations support 2017-03-04 18:15:16 +02:00
Andris Reinman
45ce56e7c9 v1.22.0 2017-03-02 15:31:06 +02:00
Andris Reinman
66bfcebd47 added support for ses 2017-02-17 15:56:55 +02:00
Andris Reinman
c42c71a308 allow using only text content 2017-01-29 18:36:10 +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
005941731b Bumped dependencies 2016-12-08 12:15:33 +02:00
Andris Reinman
bd20e16d73 v1.19.1 2016-09-15 10:06:19 +03:00
Andris Reinman
0896e9f9cf v1.19.0 2016-09-15 09:57:19 +03:00