Tomas Bures
731226dfeb
Merge branch 'master' of github.com:Mailtrain-org/mailtrain
...
Conflicts:
test/e2e/index.js
test/e2e/lib/mail.js
test/e2e/lib/mocha-e2e.js
test/e2e/lib/page.js
test/e2e/lib/worker-counter.js
test/e2e/page-objects/subscription.js
2017-05-28 19:23:43 +02:00
witzig
19a563bc6a
Remaining e2e subscription tests
...
@bures, I’m not too happy with switchToList(). Suggestions? If we keep
it, it should probably be added to every useCase.
2017-05-28 00:13:33 +02:00
witzig
2c930c60d2
Fixed ER_DUP_FIELDNAME during sqlinit
2017-05-27 20:15:28 +02:00
vladimir
25bb4afa80
Merge with upstream
2017-05-27 14:07:56 +02:00
vladimir
59912e3c29
Separate disable opened/clicked tracker to 2 options
2017-05-27 14:04:49 +02:00
Tomas Bures
62cc881fd4
Merge remote-tracking branch 'upstream/master'
2017-05-18 22:46:53 +02:00
witzig
ff4505139c
Updated install scripts. Now uses Node v7.x
2017-05-18 09:56:23 +02:00
witzig
6c35046ab2
e2e tests (draft)
2017-05-10 01:40:02 +02:00
Tomas Bures
bd4961366f
More or less all the functionality for selectable unsubscription process. Not tested yet!
...
Sending emails moved completely to controller. It felt strange to have some emails sent from the controller and some of them from the model.
Confirmations refactored to an independent model that can be potentially used also for other actions that need an email confirmation.
2017-05-03 15:53:34 -04:00
Tomas Bures
3783d7c2ce
Halfway through extending subscriptions by selectable unsubscription process. Also contains changes towards better handling of scenarios when address is already subscribed.
2017-04-30 10:51:47 -04:00
Tomas Bures
20028303f8
Additions to the install scripts
2017-04-27 19:30:11 -04:00
Tomas Bures
540c9044ae
Updated setup scripts
2017-04-27 18:41:03 -04: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
c3edf42ada
Fixes in install script on CentOS 7
2017-04-26 05:20:29 -04:00
Tomas Bures
8237dd5d77
The "Reports" feature seems functional.
...
Some small refactoring (column widths) of rendering tables in Lists, Templates, and Campaigns so that it is the same as Reports.
2017-04-20 19:42:01 -04:00
Tomas Bures
e7d12f1dbc
Halfway through in refactoring the report generation to a separate process running asynchronously of the Express server.
2017-04-17 18:31:01 -04:00
Tomas Bures
6ba04d7ff4
This is a preview of the Reports functionality.
...
It allows defining report templates and then create reports based on the templates.
A template defines:
- parameters - to be set in the report (currently only selection of campaigns, in the future to be extended to selection of lists/segments, and selection from pre-defined options)
- data retrieval / processing code (in Javascript)
- rendering template (in Handlebars)
This main functionality is accompanied by a few minor tweaks here and there. Worth notice is the ability to use server-side ajax table s for multi-selection of campaigns. This is meant for reports that compare data across multiple campaigns. This could possibly be even used for some poor man's A/B testing.
Note that the execution of custom JavaScript in the data retrieval / processing code and definition of custom Handlebars templates is a security issue. This should however be OK in the general case once proper user management with granular permissions is in. This is because definition of a report template is anyway such an expert task that it would normally be performed only by admin. Instantiation of reports based on report templates can be then done by any user because this should no longer be any security problem.
2017-04-16 18:09:08 -04:00
Tomas Bures
c74232e9c5
Added option to mark a list as not being allowed to be subscribed by public users using the form.
...
The settings is a checkbox in list create/edit.
2017-04-14 08:57:47 -04:00
vladimir
818e764b28
Fix error in SQL migration: utf8mb4 was not work with varchar(255)
2017-04-13 18:48:54 +02:00
vladimir
c9136f8abd
Add blacklist function
2017-04-11 10:10:02 +02:00
witzig
59f19534e7
Don't enable VERP by default. #56 and #106
2017-04-08 13:21:09 +02:00
Andris Reinman
4ca98dd437
v1.23.2
2017-04-04 12:40:06 +03:00
vladimir
1547e887c3
Add option to disable email cheking for imported CSV
2017-03-31 11:20:43 +02:00
Andris Reinman
47705c212d
Replaced andris9 with Mailtrain-org
2017-03-23 15:47:00 +02:00
witzig
06fca3acdb
Added ImageMagick to install.sh
2017-03-22 11:22:52 +01:00
Andris Reinman
73ee6bf4a1
updated mailtrain sql
2017-03-21 10:31:56 +02: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
8caf334fcc
Cosmetic changes
2017-03-21 01:06:05 +02:00
witzig
f2b7d4c8df
Removed data keys from table custom_forms
2017-03-20 21:25:41 +01:00
vladimir
e3cb6ca679
Fix formating and rewrite migration script
2017-03-20 21:50:53 +02:00
witzig
c3ee53bd4b
Refactored Custom Form Table Structure
2017-03-20 19:37:09 +01: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
2e50fbc8ae
Custom Forms
2017-03-19 13:36:57 +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
500ef03aae
Update install.sh
2017-02-26 08:48:52 +02:00
Andris Reinman
7fde2a9619
Update mailtrain.service
2017-02-14 10:16:22 +02:00
Jachin Rupe
79cc7e33df
A fix for issue #133 .
2017-02-13 20:46:31 -06:00
Andris Reinman
9946f70992
Added SendPulse links
2016-12-13 11:41:40 +02:00
Andris Reinman
b35be19824
updated setup script
2016-12-11 00:49:26 +02:00
Andris Reinman
8ca1fbb535
Added option to spawn multiple sender processes
2016-12-11 00:38:54 +02:00
Andris Reinman
170b60f9a0
Added option to set default options for nodemailer
2016-12-07 21:39:36 +02:00
Andris Reinman
7fce6e28fa
Allow updating subscribers email address
2016-12-07 16:12:26 +02:00
Johannes Zellner
9729246a4c
Add reply_to field to campaigns table
2016-11-25 17:10:19 +01:00
Andris Reinman
e1d725d786
Update mailtrain.service
2016-11-16 09:25:44 +02:00
Andris Reinman
73f8baa3fb
Updated install script
2016-10-18 19:53:27 +03:00
Andris Reinman
1eec09deb5
Added Apache2 config example
2016-09-28 16:33:28 +03:00
