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

1012 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tomas Bures
bbbe671d59 Merge branch 'pull/528' into development-tb 2019-05-19 22:22:29 +02:00
Tomas Bures
97b4bb7574 Mosaico MJML sample updated to showcase conditional display markup. 2019-05-19 19:20:02 +02:00
Tomas Bures
e40793b874 Fixes to detecting changes in forms. 2019-05-19 19:07:10 +02:00
Tomas Bures
cbb29a0840 Fixes to detecting changes in forms. 2019-05-19 19:06:30 +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
8eae6d6c41 Update of extract.js to process translations in other languages. 2019-05-13 01:07:01 +02:00
Tomas Bures
79164c5fe5 Update of extract.js to process translations in other languages. 2019-05-13 00:45:36 +02:00
Tomas Bures
0e9d192b1f Update of extract.js to process translations in other languages. 2019-05-13 00:35:19 +02:00
Tomas Bures
b1efb95315 Update of extract.js to process translations in other languages. 2019-05-12 23:59:13 +02:00
Tomas Bures
03bcba1667 Merge branch 'pull/595' into development-tb 2019-05-12 10:09:33 +02:00
Tomas Bures
e064948838 RC1 of confirmation dialogs displayed when one navigates from a page with unsaved changes. 
Fixes in Share and UserShare.
 2019-05-12 10:00:10 +02:00
Tomas Bures
c4b78c4823 Work in progress on confirmation dialogs displayed when one navigates from a page with unsaved changes. 
Optimized imports.
 2019-05-12 00:18:04 +02:00
Tomas Bures
008fd21b51 Work in progress on confirmation dialogs displayed when one navigates from a page with unsaved changes. 
Optimized imports.
 2019-05-12 00:00:09 +02:00
Tomas Bures
3921a6b2cb Work in progress on confirmation dialogs displayed when one navigates from a page with unsaved changes. 
Optimized imports.
 2019-05-08 23:48:13 +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
0618d899c0
Update langs.js 2019-05-06 10:14:52 -03:00
bbraganca
7f979d554e
Update translate.js 2019-05-06 10:14:11 -03:00
bbraganca
91c059144f
Update i18n.js 2019-05-06 10:12:44 -03:00
bbraganca
b0c3858268
Create common.json 2019-05-06 10:10:57 -03:00
Tomas Bures
4f77272042 Updated ivis-core 2019-04-22 22:48:08 +02: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
c00bd68123 Removed package-lock.json, such that it is automatically updated during install. It seems that at this point, we might have more problems with stale package-lock.json than with incompatible dependencies. 2019-04-15 19:44:13 +02:00
Tomas Bures
1f1cf81a17 New versino of ivis-core. It is not used at moment, so this should not really affect anything. 2019-04-15 18:52:07 +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
d0d42ab280
Merge pull request #579 from trucknet-io/development 
Dockerfile update
 2019-04-15 18:13:33 +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
Alexander Gusev
8a879c91bd chore: Dockerfile update 
node:10-14-alpine image is used (because jessie is oudated and can not install packages
adding package-lock.json to make sure the same dependencies' versions are used
added an option to pass redisHost, mongoHost, mysqlHost to use in Kubernetes cluster
 2019-04-03 14:25:09 +03: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
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