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

150 commits

Author SHA1 Message Date
Tomas Bures
4736afd5ab Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development-tb 2019-06-15 10:25:21 +02:00
Alexander Gusev
39f3682c27 fix(transactionalApi): added getting of variables to TemplateSender [Resolves #606] 2019-06-11 19:37:45 +03:00
Tomas Bures
fcd2a61b65 Child processes are now terminated when the parent process dies. This means that if the main mailtrain process gets killed, there are no processes which remain running. 2019-05-25 21:57:11 +02:00
Tomas Bures
1270ca71f8 Some fixes 2019-05-25 21:18:18 +02:00
Tomas Bures
3c72e778d9 Merged PR #528 
Support for detecting MTA by its response. Message IDs are reconstructed based on detected MTA.
Bugfixes for AWS. AWS now seems to work.
 2019-05-20 00:21:03 +02:00
Tomas Bures
bbbe671d59 Merge branch 'pull/528' into development-tb 2019-05-19 22:22:29 +02:00
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
Gernot Pansy
d52436c566 added webhook support for postal mail server 2019-02-14 22:38:35 +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
Tomas Bures
127900a4d4 Services enabled back to normal 2019-01-12 11:53:07 +01:00
Tomas Bures
0d7f962c86 Fix - subscriber custom data were not listed in correct order in the subcribers list 
"Test user" field added to segment rules
Configuration option to automatically share arbitrary namespace based on user role.
 2019-01-12 11:21:38 +01:00
Tomas Bures
a1e52c2d7a Fix for #516 2019-01-12 11:20:58 +01:00
Tomas Bures
c1731bf09f Some refactoring to aling it more with IVIS and coreui theme. 2019-01-05 23:56:16 +01:00
Tomas Bures
397f85dac4 Harmonization with IVIS 2019-01-04 21:31:01 +01:00
Tomas Bures
428fb9db7b Added an API endpoint that triggers an RSS campaign. 2018-12-29 15:12:42 +01:00
Tomas Bures
e786964411 Some fixes in RSS feed processing. 
It is now possible to have hierarchical merge tags (separated by "."). The merge tags are now case sensitive.
Mailtrain allows passing element "mt:entries-json" in the RSS item feed. If this is detected, it parses the json structure and makes it available through RSS_ENTRY_CUSTOM_TAGS. Then it can be used as [RSS_ENTRY_CUSTOM_TAGS.field_quote_text.rendered]
 2018-12-29 11:21:25 +01:00
Tomas Bures
b26f5008da Field setup wizard for new list - addresses 1st line of #510 
Bugfixes to address #511
 2018-12-31 09:45:59 +00:00
Tomas Bures
de55870561 DB driver changed to mysql to address issue #509. 2018-12-30 23:58:17 +00:00
Tomas Bures
2e847460f4 Added the possibility to use "option" field type outside a group. This is convenient to create just a single checkbox. 2018-12-28 20:54:00 +01:00
Tomas Bures
64af46b685 UI migrated to Bootstrap 4, FontAwesome 5 and CoreUI theme. 2018-12-28 10:57:00 +01:00
Tomas Bures
41d74e3cc7 Work in progress on port to Bootstrap 4 2018-12-28 05:33:07 +01:00
Tomas Bures
3425e2c16a Work in progress on migration to Bootstrap 4 and CoreUI admin theme 2018-12-27 14:42:21 +01:00
Tomas Bures
366bd09f2a Fix for #507 2018-12-26 12:52:00 +01:00
Tomas Bures
99bd4ad907 Fixed localization which was broken after 19fe5331d2 
x_mailer fixed to be '' in mailtrain.sql
 2018-12-26 05:24:52 +01:00
Tomas Bures
cfdcaf65d8 Fixed bug - files/uploaded had wrong owner 
Upgrade to React 16
 2018-12-26 04:38:02 +01:00
Tomas Bures
dce5ba7464 First steps in integration of IVIS. 2018-12-25 20:13:32 +01:00
Tomas Bures
3b1986116f Fixes in VERP handling. 
VERP disable header option moved from config to send configurations.
Some additional logging for VERP.
 2018-12-26 09:24:46 +00:00
root
a769bfb567 Fixes in VERP server. The VERP server now seems to work fine. 2018-12-25 21:46:52 +00:00
root
8a38133ffc Updates in send configurations. 2018-12-25 19:10:28 +01:00
root
7b520387d2 Updates in install scripts 2018-12-25 18:07:03 +01:00
Tomas Bures
3d956ec141 Localization of device types 2018-12-23 19:44:29 +00:00
Tomas Bures
83ce716d94 Various fixes. 2018-12-23 19:27:29 +00:00
Tomas Bures
1073d03d1b base.sql and mailtrain.sql updated to fresh v2 DB schema and data 2018-12-21 22:37:30 +00:00
Tomas Bures
89a2aa15a4 Updates in the setup 2018-12-21 20:21:03 +01:00
Tomas Bures
5a16d789a0 Fixes in reports. Reports seem to work now 2018-12-21 19:09:18 +01:00
Tomas Bures
77c64f487d Built-in Zone MTA 
Plugin for ZoneMTA for per-message DKIM keys.
 2018-12-16 22:35:21 +01:00
Tomas Bures
d103a2cc79 Panels with campaign statistics and some fixes in computation of clicks. 2018-12-16 13:47:08 +01:00
Tomas Bures
ba996d845d Forms preview 2018-12-15 20:09:07 +01:00
Tomas Bures
97bbac8698 Merge branch 'development' of github.com:Mailtrain-org/mailtrain into development 2018-12-15 15:16:23 +01:00
Tomas Bures
cb1fc5b28d Further work on localization 2018-12-15 15:15:48 +01:00
Tomas Bures
f21cea2aec Added error message when someone tries to access mailtrain while it is loading. 
This prevents one to perform action on services that are still initializing (e.g. senders, where update of a send configuration causes config reload on the sender process, which may not be started yet and thus responds with error that send method is not defined)
 2018-11-24 01:49:01 -05:00
Tomas Bures
fa451fc8da Some more fixes in sources for fields 2018-11-24 06:58:14 +01:00
Tomas Bures
106acd0656 Added sample apache conf. 
Fixed fields (source column was not created/deleted when a new column was added/removed)
 2018-11-24 06:47:16 +01:00
Tomas Bures
43c6b58793 Completely removed CKEditor 5 
Some fixes of bugs from testing in production env.
 2018-11-24 00:48:41 -05:00
Tomas Bures
d459f7cfed Updates in default config 2018-11-23 21:38:46 +01:00
Tomas Bures
3bb235a585 Removed CKEditor 5 because it was of little use and doubled the code size of root.js 
Word wrap and Save to code editor.
 2018-11-22 15:21:15 +01:00
Tomas Bures
b058169e12 Added confirmations for unsubscribe, blacklist and remove from blacklist 2018-11-22 11:31:16 +01:00
Tomas Bures
92ca1c0f28 Implemented basic support for GDPR 2018-11-22 00:02:14 +03:00
Tomas Bures
b37ad9863c Finished support for triggered campaigns. So far only smoke-tested for subscription trigger. 2018-11-21 01:41:10 +03:00
Tomas Bures
f7cbcf871d Work in progress on supporting languages in custom forms 2018-11-18 22:53:34 +01:00
Tomas Bures
dc7789c17b Extracted strings and fixes on localization support 
Language chooser in the UI
 2018-11-18 21:31:22 +01:00
Tomas Bures
2edbd67205 New project structure 
Beta of extract.js for extracting english locale
 2018-11-18 15:38:52 +01:00