Alexander Gusev
ae461383bd
Merge pull request #4 from Mailtrain-org/development
...
Merge pull request #573 from trucknet-io/development
2019-04-03 12:06:42 +03:00
Tomas Bures
3a45443b64
Merge pull request #573 from trucknet-io/development
...
feat(api): Transactional mail rest api
2019-04-02 16:23:35 +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
ed4a13fef7
Added transactional mail api docs
2019-03-31 13:07:29 +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
Alexander Gusev
dc4f0922ef
Merge pull request #2 from trucknet-io/transactional-mail-v2
...
Transactional mail v2
2019-03-31 11:40:44 +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
63cfb22025
Merge branch 'development' into development-tb
2019-03-27 09:54: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
Tomas Bures
3ae4c77fb4
Preparations for mosaico MJML templates
2019-03-26 22:48:31 +01:00
Alexey Zinkevych
4a521a8f0f
Implemented basic transactional emails API
2019-03-25 14:48:18 +02:00
Alexey Zinkevych
913c7dc337
Added .vscode to .gitignore
2019-03-24 11:27:51 +02:00
Carlos
53340ad631
fix
2019-03-20 09:03:06 +01:00
Carlos
b583df7e2f
fix
2019-03-20 08:58:46 +01:00
Carlos
444717b4d0
Templates namespace filtering & fix
2019-03-20 08:57:06 +01:00
Carlos
b6a896558e
fix
2019-03-15 10:10:48 +01:00
Carlos
b5a6167202
common.json filtering namespace labels
2019-03-14 16:34:16 +01:00
Carlos
74fe5e73e2
Namespace filtering when create/edit campaigns
2019-03-14 16:15:37 +01:00
Carlos
7b08e2e97b
Spanish lang update
2019-03-13 16:36:35 +01:00
Carlos
41b311c811
Spanish lang update
2019-03-13 15:18:40 +01:00
Carlos
75daaa1a65
Confirmation modal when launching campaign
2019-03-13 15:00:49 +01:00
Carlos
5d08db67b3
Show status bug
2019-03-13 13:23:57 +01:00
Carlos
83267a7e28
Checkbox text alignment and override checkboxes reorganized
2019-03-13 13:09:37 +01:00
Carlos
bdacf92917
Campaigns: Show override checkbox when Send configuration allows it
2019-03-13 10:22:19 +01:00
Carlos
1a61067ff9
Campaign status show send settings Bug
2019-03-13 09:52:02 +01:00
root
0037b39656
Fix for:
...
Reinstalling modules in mvis/ivis-core/client
/opt/mailtrain/setup/functions: line 222: cd: mvis/ivis-core/client: No such file or directory
2019-03-09 10:34:07 -08: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
4b1b1a380d
deleting useless files
2019-03-06 13:27:53 +01: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
Carlos
aa66c18650
works
2019-03-04 15:17:37 +01:00
Tomas Bures
4a6aed4cf7
All create/edit forms now allow staying on the page after save.
2019-02-24 11:10:23 +00: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
df2a8c1cde
Fix for #536
2019-02-17 17:18:44 +00:00
Tomas Bures
7f2a9ca940
Link to the v1 removed from v2 readme
2019-02-17 15:00:00 +00:00
