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

93 commits

Author SHA1 Message Date
Tomas Bures
2e9d44c705 Added ability to make a conditional block in MJML Mosaico. 
Mosaico switched from master to v0.17.5
Added workaround for Chrome - after save, images in Mosaico disappear
 2019-05-19 01:42:26 +02:00
Tomas Bures
a527b80291 Update of source files and integration of Portuguese translation 2019-05-13 01:10:53 +02:00
Tomas Bures
03bcba1667 Merge branch 'pull/595' into development-tb 2019-05-12 10:09:33 +02:00
Tomas Bures
48dcf2c701 Mosaico upgraded to 0.17.5 
Work started on confirmation dialogs displayed when one navigates from a page with unsaved changes
 2019-05-08 19:54:19 +02:00
bbraganca
856636d12e
Update translate.js 2019-05-06 10:19:36 -03:00
bbraganca
f04c549d24
Update translate.js 2019-05-06 10:19:02 -03:00
bbraganca
7f979d554e
Update translate.js 2019-05-06 10:14:11 -03:00
Tomas Bures
72ffe065d2 Added quick reports (at this moment only one) to campaign statistics page. 2019-04-22 22:46:48 +02:00
Tomas Bures
3e3c3a24fe Further updated on caching. Small change in DB schema to make lookups a bit more performant. Note that if DB migration in the last commit has been run, this commit will need manual update of the database. 2019-04-22 15:41:39 +02:00
Tomas Bures
ef0464bbc9 Further improvements in caching. The state of the cache is now persisted in DB. This persists the cache between server restarts. 2019-04-22 11:41:37 +02:00
Tomas Bures
7bcd6c60e9 The previous commit had some services disabled to speed up testing. The services are back now. 2019-04-22 02:58:10 +02:00
Tomas Bures
66702b5edc Fixes in reports (generating a CSV). 
Added caching of generated images in mosaico handler.
Various other fixes.
 2019-04-22 02:41:40 +02:00
Tomas Bures
055c4c6b51 package-lock.json is updated and back. The client is hopefully fixed w.r.t. #571. 2019-04-15 20:53:36 +02:00
Tomas Bures
b8f8750afd Imported some enhancements from IVIS. Candidate for a fix for #571. 2019-04-15 18:47:30 +02:00
Tomas Bures
94a2cdf89e More elements for mosaico mjml support. Added "MJML Sample" wizard to mosaico templates. 2019-04-03 23:39:10 +02:00
Tomas Bures
ec0f288d81 Merge remote-tracking branch 'origin/development' into development 2019-04-03 12:14:09 +02:00
Tomas Bures
ad9f5d16bf Added support to define mosaico templates in MJML. (A wizard that shows how to do this is TODO.) 
Adopted some core features (router, etc.) from IVIS.
 2019-04-03 12:13:49 +02:00
Alexey Zinkevych
8b39a101cd Transactional mail: minor template-sender refactoring 2019-04-02 16:35:57 +03:00
Alexey Zinkevych
e588e218b6 Transactional mail: use tools to format message 2019-04-02 16:15:35 +03:00
Alexey Zinkevych
76b4f8b8c2 Transactional mail: added data rendering 2019-04-02 14:44:07 +03:00
Alexey Zinkevych
80279346f3 Transactional mail: code review fixes 2019-03-31 15:50:40 +03:00
Alexey Zinkevych
31442453ea Merge branch 'transactional-mail-v2' into development 2019-03-31 12:57:55 +03:00
Alexey Zinkevych
e3e1e7a086 Merge branch 'development' of https://github.com/Mailtrain-org/mailtrain into transactional-mail-v2 2019-03-31 11:52:42 +03:00
Tomas Bures
3b20ac5ce7 Some fixes in expection logging, template files and resizing mosaico images 2019-03-27 23:50:20 +01:00
Tomas Bures
d482d214d9 Line endings fixed so that we don't have CRLF in Git. Better now than later. 2019-03-27 09:49:29 +01:00
Tomas Bures
2fe7f82be3 Merge and cleanup of PR #564 
The namespace filter in campaigns was dropped (i.e. "Work with campaign's namespace"). Instead, we need a universal solution. For instance a namespace slector somewhere in the top-right corner, which should apply to everything (not just campaigns).

Nevertheless, I kept the ...-by-namespace rest endpoints and related functions in models because they will be useful for implementing the universal namespace selection feature.
 2019-03-27 00:41:18 +01:00
Tomas Bures
dcb7168322 Merge branch 'pull/564' into development 2019-03-26 22:55:00 +01:00
Alexey Zinkevych
4a521a8f0f Implemented basic transactional emails API 2019-03-25 14:48:18 +02:00
Carlos
53340ad631 fix 2019-03-20 09:03:06 +01:00
Carlos
444717b4d0 Templates namespace filtering & fix 2019-03-20 08:57:06 +01:00
Carlos
74fe5e73e2 Namespace filtering when create/edit campaigns 2019-03-14 16:15:37 +01:00
Carlos
1a61067ff9 Campaign status show send settings Bug 2019-03-13 09:52:02 +01:00
Tomas Bures
9b32e59b50 Number of processes and connections of builtin zone MTA is now configurable via Mailtrains config. 2019-03-09 14:07:11 +01:00
Tomas Bures
97bb700334 Various fixes 2019-03-09 07:42:14 +00:00
Carlos
25ecd85910 CampaignNamespaceUpdateBugFixed 2019-03-06 09:47:52 +01:00
Carlos
a43302f3ab Users list only for admin added 2019-03-04 15:57:51 +01:00
Carlos
38e277cb7c Spanish lang without translation added 2019-03-04 15:44:52 +01:00
Tomas Bures
d54f941caa Some fixes. 2019-02-24 00:19:49 +00:00
Tomas Bures
41cd01c2b9 Exported CSV now contains status column (fix for #547) 2019-02-23 14:27:28 +00:00
Tomas Bures
0c3510d626 Some fixes 2019-02-18 22:42:57 +00:00
Tomas Bures
8d95f43dbc Added feature to create template from another template. 2019-02-18 20:36:44 +00:00
Tomas Bures
031b346440
Merge pull request #537 from priethor/development 
Adds 'type' property to migration of text-based segment rules
 2019-02-17 18:48:13 +01:00
Tomas Bures
f8ef57f164 Fixed bug that prevented sending via builtin zone mta. This but was introduced today. 2019-02-17 17:47:27 +00:00
Héctor
433bf31bfa
Adds 'type' property to migration of text-based segment rules 
In v2, text-based segment rules need a "type" property. As in v1 the value could contain % wildcards, the default type for migrated rules should be 'like' to support them.
 2019-02-17 18:45:35 +01:00
Tomas Bures
f7b5aef0e3 Some more fixes 
Warning dialog about missing Javascript removed from subscription dialog. The warning would flash in any case (even when Javascript is activated)
 2019-02-17 17:18:59 +00:00
Tomas Bures
46ad0c7b4f Fix for #531 2019-02-17 12:46:02 +00:00
Héctor
d1a1398828
Support for string based segment rules.... 
...such as email fields.
 2019-02-17 00:49:12 +01:00
Tomas Bures
e0bee9ed42 Some preparations for activity log. 
Fixed issue #524
Table now displays horizontal scrollbar when the viewport is too narrow (typically on mobile)
 2019-02-07 14:38:32 +00:00
Tomas Bures
4f408a26d5 Some fixes 2019-01-20 16:31:17 +00:00
Tomas Bures
d14942da93 Adoptions from ivis-core 2019-01-12 21:33:00 +01:00