Commit graph

127 commits

Author SHA1 Message Date
Tomas Bures
bf69e633c4 Added CSV export of subscribers
Fixed some bugs in subscriptions
Updated some packages to avoid warnings about vulnerabilities
Completed RSS feed campaigns
2018-11-17 02:54:23 +01:00
Tomas Bures
9f467762c0 Included MJML4 2018-11-10 02:05:26 +01:00
Tomas Bures
130c953d94 Updated packages to remove vulnerabilities reported by npm
Implementation of feedcheck - not tested though
2018-09-02 14:59:02 +02:00
Tomas Bures
739b9452de UI for basic import and preparation phase of CSV. 2018-08-26 11:46:12 +02:00
Tomas Bures
877e0a857d Merge branch 'master' into development 2018-08-06 21:02:41 +05:30
Tomas Bures
32cad03f4f Improved files to distinguish subtypes (allows multiple different files tabs at a entity)
Attachments via the improved files
Block thumbnails at mosaico templates as a separate files tab
Some fixes

All not tested yet
2018-08-02 15:49:27 +05:30
Tomas Bures
e85c707973 Some small updates coming from IVIS 2018-07-18 18:41:18 +01:00
Jonas Düver
80f2fe1b26 Bump version 2018-04-25 18:18:36 +02:00
Tomas Bures
b5cdf57f72 Files can be added to templates and managed in a dedicated "Files" view.
Mosaico integration in progress. The files seem to be working for Mosaico.
2018-03-24 23:55:50 +01:00
Tomas Bures
e9165838dc Subscription/unsubscription seems to work. 2018-01-27 16:37:14 +01:00
Tomas Bures
d8ee364a4b settings keys in DB converted to camel case
callback-based settings model replaced by async-based settings model
2017-12-30 17:27:24 +01:00
witzig
7a93628cc8 Merge branch 'master' into bures-access
# Conflicts:
#	package.json
2017-09-26 15:29:49 +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
Tomas Bures
6d95fa515e CUD operations on reports and report templates seem to work
Execution of reports is TBD
2017-07-11 11:28:44 +02:00
Tomas Bures
d79bbad575 All about user login
Not runnable at the moment
2017-07-08 15:48:34 +02:00
Tomas Bures
e7856bfb73 Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access 2017-06-21 02:16:28 +02:00
Tomas Bures
c81f5544e6 Added support for Datatables
Added support for ajax-based server side validation (useful for validation of emails, duplicate usernames, etc.)
User form more or less ready in the basic version (i.e. without permission management)
2017-06-21 02:14:14 +02:00
witzig
3c4558d70c Refactored and linted editorapi image handling 2017-06-20 19:08:14 +02:00
Tomas Bures
f776170854 Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access
Conflicts:
	package.json
2017-06-17 10:11:07 +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
Tomas Bures
4504d539c5 Some basic components for building forms. 2017-06-04 13:16:29 +02:00
Tomas Bures
d13fc65ce2 Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access 2017-06-03 07:50:09 +02:00
witzig
cec227d688 Fixed Merge Tags for custom date fields 2017-06-02 03:05:19 +02:00
Tomas Bures
4f52b571c9 Some bits for ReactJS-based client. 2017-05-28 18:49:00 +02:00
Tomas Bures
115d254baf Merge branch 'master' into access
Conflicts:
	config/default.toml
2017-05-27 10:43:31 +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
Tomas Bures
1b73282e90 WiP on namespaces and users 2017-05-15 16:22:06 -04: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