public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
774 commits 9 branches 34 tags 30 MiB
Commit graph

154 commits

Author SHA1 Message Date
Tomas Bures
d74806dde3 Basic import seems to work 2018-09-01 21:29:10 +02:00
Tomas Bures
16519c5353 Some additions to import UI to cover the basic subscribe and unsubscribe cases. 2018-08-26 15:32:03 +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
cd798b5af7 Preparation of merge with master 2018-08-06 20:24:51 +05:30
Tomas Bures
ee0d148427 Merge branch 'pr453' 2018-08-05 17:44:58 +05:30
Tomas Bures
8193f0bf4d Merge PR #451 2018-08-05 17:36:10 +05:30
Tomas Bures
fe7d34e0f6 Merged pull request #412 2018-08-05 17:22:31 +05:30
Tomas Bures
6648028270 First part of the UI for file import (upload of csv file to the server) 2018-08-05 10:17:05 +05:30
Tomas Bures
965f30cea7 Editing of triggers seems to work. 
Some further fixes.
 2018-08-04 15:00:37 +05:30
Tomas Bures
ffc26a4836 Migration and model for triggers. 
Not tested.
 2018-08-03 21:37:46 +05:30
Tomas Bures
7b46c4b4b0 Editing of campaigns seems to work 2018-08-03 17:05:55 +05:30
Tomas Bures
b1c667d13d Merged migrations into one big v1->v2 which is not incremental, thus it does not need code copy-pasting. 
Some fixes.
 2018-08-02 17:05:57 +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
ade0fc87f2 work in progress on campaign edit 2018-08-01 15:30:20 +05:30
Raphael Hittich
68cb8384f7 Add custom unsubscribe option in a campaign 2018-08-01 10:46:34 +02:00
Tomas Bures
0e0fb944e3 First attempt on campaign editing. Misses attachments. Untested. 2018-07-31 10:04:28 +05:30
Raphael Hittich
44fe8882b8 Add X-Mailer header option in settings to override or disable it. 2018-07-27 14:46:46 +02:00
Tomas Bures
ee786bc8ad Fixes in migration of templates and campaigns from Mailtrain ver 1 2018-07-22 15:02:43 +05:30
Tomas Bures
189638364c Added migration for campaigns 2018-07-22 00:01:28 +05:30
Reto Kaiser
16ce44146f Add option on list to disable "List-Unsubscribe" header 2018-06-13 09:53:29 +02:00
Tomas Bures
a4ee1534cc WiP on mailers 2018-04-29 18:13:40 +02:00
Jonas Düver
52f4213cb7 Add segment support to triggers model and database 2018-04-25 18:16:51 +02:00
Tomas Bures
c12efeb97f Configuration split to lists, send configurations and server config. 
This is before testing.
 2018-04-22 17:33:43 +02:00
Tomas Bures
4fce4b6f81 WiP updates 2018-04-22 09:00:04 +02:00
Tomas Bures
6706d93bc1 Basic support for Mosaico templates. 
TODO:
- Allow choosing a mosaico template in a mosaico-based template
- Integrate the custom mosaico templates with templates (endpoint for retrieving a mosaico template, replacement of URL_BASE and PLACEHOLDER tags
- Implement support for MJML-based Mosaico templates
- Implement support for MJML-based templates
- Implement support for GrapeJS-based templates
 2018-04-02 19:05:22 +02:00
Tomas Bures
7b5642e911 Basic support for Mosaico-based email templates. 2018-04-02 11:58:32 +02:00
Tomas Bures
7750232716 Merge remote-tracking branch 'upstream/master' into development 2018-02-24 23:05:01 +01:00
Tomas Bures
508d6b3b2f Beginning of work on templates. 2018-02-13 23:50:13 +01:00
Tomas Bures
47b8d80c22 Fixes in subscriptions. It now passes the tests. 
API tests still don't work.
 2018-01-28 23:59:05 +01:00
Andris Reinman
3c36d298c4 updated install script 2018-01-09 12:43:02 +02: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
wotomg
1e7ca17cb6 Update install.sh 
Some fixes. Anyway, scripts does not work.
 2017-09-18 14:44:03 +03:00
Tomas Bures
f3ff89c536 WiP on segments 2017-08-19 15:12:22 +02:00
Tomas Bures
d0a714b3d4 Snapshot before refactoring the rule settings to a separate component 2017-08-17 23:32:49 +02:00
Tomas Bures
0bfb30817b work in progress on segments 
some cleanup of models - handling dependencies in delete
 2017-08-14 22:53:29 +02:00
Tomas Bures
e73c0a8b28 Work in progress on subscriptions 2017-08-13 20:11:58 +02:00
Tomas Bures
86fce404a9 work in progress on custom fields 2017-08-11 08:51:30 +02:00
Tomas Bures
f6e1938ff9 Lists list and CUD 
Custom forms list
Updated DB schema (not yet implemented in the server, which means that most of the server is not broken).
- custom forms are independent of a list
- order and visibility of fields is now in custom_fields
- first_name and last_name has been turned to a regular custom field
 2017-07-29 22:42:07 +03:00
Tomas Bures
89256d62bd WiP on permissions 
Table of shares per user
 2017-07-27 17:11:22 +03:00
Tomas Bures
89c9615592 WiP on permissions 
Doesn't run. This commit is just to backup the changes.
 2017-07-26 22:42:05 +03:00
Tomas Bures
5df444f641 Computation of permissions seems to somehow work. 2017-07-25 02:14:17 +03:00
Tomas Bures
e7bdfb7745 Namespace selection for users, reports and report-templates 2017-07-24 14:43:32 +03:00
Tomas Bures
4822a50d0b Share report template functionality 2017-07-24 07:03:32 +03:00
Tomas Bures
d4cea46f07 Report templates ported to ReactJS and Knex. 
Does not run yet because reports have dependencies on the old report templates.
 2017-07-09 15:41:53 +02:00
Tomas Bures
d79bbad575 All about user login 
Not runnable at the moment
 2017-07-08 15:48:34 +02:00
Tomas Bures
eb2287f6e9 Release candidate of basic user management - currently only CRUD on users, no permission assignment. 2017-06-29 23:22:33 +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
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
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