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

205 commits

Author SHA1 Message Date
Tomas Bures
7e52000219 Added MJML/HTML codeeditor with a preview for template design. 2018-11-13 21:35:33 +01:00
Tomas Bures
e2093e22fe Some fixes and optimizations in sandboxes. 
Start of a sandbox for GrapeJS
 2018-11-06 13:30:50 +01:00
Tomas Bures
02a7275ae4 Added sandboxed CKEditor 4 as a template editor 2018-11-04 11:19:34 +01:00
Tomas Bures
eacdc74c29 CKEditor components replaced by CKEditor 5. 
Remains of the sandboxed CKEditor - will be removed, but the version here may be useful for another editor that is prone to XSS (like Summernote).
 2018-11-03 21:46:23 +01:00
Tomas Bures
5670d21e76 Bugfixing. 2018-09-27 12:34:54 +02:00
Tomas Bures
dda95ecdb3 Implementation of archive route. Simplified from v1. Not tested. 2018-09-22 18:12:22 +02:00
Tomas Bures
63765f7222 Client's public folder renamed to static 
Regular campaign sender seems to have most of the code in place. (Not tested.)
 2018-09-18 10:30:13 +02:00
Tomas Bures
7788b0bc67 Fixed sandbox. Multiple tabs work now. 
WiP on selectable mosaico templates.

TODO: Make files always point to trusted URL, such that we don't have to rebase them. They are public anyway. The same goes for mosaico endpoints: /mosaico/templates and /mosaico/img
 2018-05-09 04:07:01 +02:00
Tomas Bures
a4ee1534cc WiP on mailers 2018-04-29 18:13:40 +02:00
Tomas Bures
4fce4b6f81 WiP updates 2018-04-22 09:00:04 +02:00
Tomas Bures
c85f2d4440 Obsoleting some old files 
Transition to SPA-style client
Basis for Mosaico template editor
 2018-02-25 20:54:15 +01:00
Tomas Bures
7750232716 Merge remote-tracking branch 'upstream/master' into development 2018-02-24 23:05:01 +01:00
Georgios Anastasiou
b151784071 Docs for api/lists/:email 2018-02-06 14:57:58 +02: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
Tomas Bures
e9165838dc Subscription/unsubscription seems to work. 2018-01-27 16:37:14 +01:00
Roger Witzig
eb8a5878dd
Merge pull request #344 from brentdur/brentdur/247_template-duplicate 
Adds duplicate Template
 2017-11-15 12:56:34 +01:00
Gerard Krol
8b2e3b47b0 Add note about generated names of custom fields. 2017-11-08 10:54:18 +00:00
Gerard Krol
ac09ba81dd Add API documentation for GET /api/subscriptions/:listId 2017-11-06 10:34:55 +00:00
Brenton Durkee
0cbec006b4 Adds duplicate button to Template edit form. 
Adds duplicate model function for Template that gets a Template by id
and creates a new Template with the same data.
 2017-10-16 11:29:57 -04:00
witzig
0a369e2475 Fix grouped custom fields not saving deselected values #333 2017-10-05 13:39:53 +02:00
witzig
46acece89c Improve CSV import error handling, closes #324 2017-09-29 00:32:00 +02:00
witzig
83e62e990b Update import.hbs 2017-09-29 00:19:19 +02:00
witzig
c5b481a266 Add option to preserve unsubscribed status on list import, #325 2017-09-28 00:55:19 +02:00
Tomas Bures
602364caae Fluid layout 
Reworked routing and breadcrumb mechanism. It allows resolved parameters in paths, which allows including names of entities in the breadcrumb.
Secondary navigation which is aware of permissions.
 2017-08-11 18:16:44 +02:00
Tomas Bures
4822a50d0b Share report template functionality 2017-07-24 07:03:32 +03:00
Tomas Bures
ad1e4c58f5 Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access 
Conflicts:
	views/users/api.hbs
 2017-07-09 23:34:03 +02: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
be7da791db LDAP auth seems to work too. 
Users completely refactored to ReactJS and Knex
Initial draft of call context passing (for the time being only in users:remove
 2017-07-08 21:34:26 +02:00
Tomas Bures
9758b4b104 Local auth seems to work 2017-07-08 18:57:41 +02:00
Tomas Bures
d79bbad575 All about user login 
Not runnable at the moment
 2017-07-08 15:48:34 +02:00
witzig
bd570000e1 Added documentation for API endpoint /api/field/:listId 
This has accidentally been removed with PR #203.
 2017-07-06 15:08:35 +02:00
witzig
f0e32ef5a5 Added note about blacklist, #272 2017-07-01 01:50:50 +02:00
Tomas Bures
e7856bfb73 Merge branch 'master' of github.com:Mailtrain-org/mailtrain into access 2017-06-21 02:16:28 +02:00
witzig
3c4558d70c Refactored and linted editorapi image handling 2017-06-20 19:08:14 +02:00
Andris Reinman
8b900a9c44 Removed ads from code 2017-06-20 16:47:25 +03: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
a7b2c33b30 GrapeJS MJML Integration (Experimental) 
#215
 2017-05-31 02:08:44 +02:00
Tomas Bures
cda93630ea Merge branch 'master' into access 
Conflicts:
	test/e2e/lib/worker-counter.js
 2017-05-28 19:35:06 +02:00
Tomas Bures
4f52b571c9 Some bits for ReactJS-based client. 2017-05-28 18:49:00 +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
115d254baf Merge branch 'master' into access 
Conflicts:
	config/default.toml
 2017-05-27 10:43:31 +02:00
Tomas Bures
62cc881fd4 Merge remote-tracking branch 'upstream/master' 2017-05-18 22:46:53 +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
Tomas Bures
11990d62b2 Merge branch 'master' of github.com:Mailtrain-org/mailtrain 
Conflicts:
	languages/de_DE.po
 2017-05-04 17:58:55 -04:00
Tomas Bures
a6d25e668b Release candidate of the selectable unsubscription 
Implemented the resubscription process - i.e. pre-filling in the form when the subscription link is clicked in the unsubscription notice.
 2017-05-04 17:42:46 -04:00
witzig
408db13fd4 Updated RSS merge tag reference 2017-05-03 23:13:05 +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