Andris Reinman
|
0879fa412a
|
force template html as html code, not an url or file path
ensure that external resources are not loaded by jsdom
|
2017-03-19 14:13:01 +02:00 |
|
Andris Reinman
|
9d5fb816c9
|
Fixes issue with HTML entities
|
2017-03-19 13:39:34 +02:00 |
|
vladimir
|
d1451f48b2
|
[bugfix] Add data volumes for grapejs and grapejs uploads
|
2017-03-17 17:27:27 +02:00 |
|
vladimir
|
0c1684a751
|
[feature] Add Dockerfile and update README
|
2017-03-17 17:09:56 +02:00 |
|
Andris Reinman
|
d2b0a611d7
|
Merge pull request #178 from larrabee/master
[bugfix] Fix LDAP issue with OpenLDAP/MS AD
|
2017-03-15 20:59:19 +02:00 |
|
vladimir
|
b6497b0e86
|
Fix logging for ldap module
|
2017-03-15 20:45:21 +02:00 |
|
vladimir
|
1ca27b6b40
|
Remove passport-ldapjs from packpage.json and add warning message
|
2017-03-15 20:26:54 +02:00 |
|
vladimir
|
2e5def404f
|
[bugfix] Fix LDAP issue with OpenLDAP/MS AD
|
2017-03-15 19:10:00 +02:00 |
|
Andris Reinman
|
5332c81739
|
Merge pull request #176 from witzig/landingpage
Added screenshots and cleaned up landingpage
|
2017-03-12 14:41:39 +02:00 |
|
witzig
|
6c7a31dcb4
|
Updated some screenshots
|
2017-03-12 12:37:56 +01:00 |
|
witzig
|
82cac028b8
|
Fixed position of API screenshot
|
2017-03-12 03:06:51 +01:00 |
|
witzig
|
9ed2b1b9bb
|
Updated mailtrain.pot
|
2017-03-12 01:22:33 +01:00 |
|
witzig
|
3aaf9bc6bf
|
Fixed title case
|
2017-03-12 01:13:24 +01:00 |
|
witzig
|
a2450507c6
|
Rename index-2.hbs to index.hbs
|
2017-03-12 01:10:08 +01:00 |
|
witzig
|
019dc526ca
|
Delete legacy screenshots
|
2017-03-12 01:06:51 +01:00 |
|
witzig
|
648a6ea57c
|
Cleanup landingpage
Changed to title case
Made carousel lazy load
Feature specific screenshots
|
2017-03-12 01:04:43 +01:00 |
|
witzig
|
713e20bc6c
|
Added screenshots
|
2017-03-11 22:59:15 +01:00 |
|
Andris Reinman
|
16cd6ba6b1
|
Merge branch 'witzig-landingpage'
|
2017-03-11 17:51:49 +02:00 |
|
Andris Reinman
|
2098527c1d
|
Merge branch 'landingpage' of https://github.com/witzig/mailtrain into witzig-landingpage
|
2017-03-11 17:41:10 +02:00 |
|
Andris Reinman
|
cf03039268
|
Merge pull request #174 from witzig/patches-2
Fixed some translation tags
|
2017-03-11 15:37:03 +02:00 |
|
witzig
|
c2ffc684bf
|
Updated mailtrain.pot
|
2017-03-11 13:28:33 +01:00 |
|
witzig
|
1aef9b3b7c
|
Removed Mosaico legacy styles
|
2017-03-11 13:28:07 +01:00 |
|
witzig
|
fe9928fac0
|
Fixed vertical spacing of settings page and made inputs consistent
|
2017-03-11 13:27:42 +01:00 |
|
witzig
|
c4edd89576
|
Fixed some translation tags
|
2017-03-11 13:27:21 +01:00 |
|
witzig
|
fca8313a5e
|
Landing Page Proposal
|
2017-03-11 13:21:07 +01:00 |
|
Andris Reinman
|
406a03a1f9
|
Merge pull request #173 from witzig/fix-campaign-view
Moved delivered count into stats section
|
2017-03-11 13:06:02 +02:00 |
|
witzig
|
adf183856f
|
Moved delivered count into stats section
|
2017-03-11 09:52:12 +01:00 |
|
Andris Reinman
|
bec976e061
|
Merge pull request #170 from witzig/editor-fixes
Editor fixes/improvements
|
2017-03-10 19:01:57 +02:00 |
|
witzig
|
87723d05ee
|
Improved GrapeJS toastr notifications
|
2017-03-10 17:11:49 +01:00 |
|
witzig
|
c7427596b1
|
Fix GrapeJS image resizing
|
2017-03-10 16:50:16 +01:00 |
|
witzig
|
94897b18fd
|
Allow external custom scripts for Mosaico
|
2017-03-10 15:44:23 +01:00 |
|
witzig
|
1ea399cbe9
|
Reduce error handling noise
|
2017-03-10 15:38:04 +01:00 |
|
Andris Reinman
|
17f09d4549
|
Merge pull request #169 from witzig/patch-1
Fixed broken translate tag
|
2017-03-10 16:04:48 +02:00 |
|
witzig
|
5cda88ad9f
|
Update reset.hbs
|
2017-03-10 14:53:12 +01:00 |
|
Andris Reinman
|
55d23145a8
|
Merge branch 'master' of github.com:andris9/mailtrain
|
2017-03-10 14:15:29 +02:00 |
|
Andris Reinman
|
83bb718a49
|
Merge branch 'witzig-editors-2'
|
2017-03-10 14:14:50 +02:00 |
|
Andris Reinman
|
020a77c78f
|
applied some code style changes
|
2017-03-10 14:14:38 +02:00 |
|
Andris Reinman
|
e34e07f61e
|
Merge branch 'editors-2' of https://github.com/witzig/mailtrain into witzig-editors-2
|
2017-03-10 13:26:22 +02:00 |
|
Andris Reinman
|
120344bd58
|
updated et translation files
|
2017-03-10 13:26:07 +02:00 |
|
Andris Reinman
|
f6f5f4e831
|
Merge pull request #168 from witzig/custom-scripts-and-styles
Inject custom CSS and JS files in layout.hbs
|
2017-03-10 13:20:25 +02:00 |
|
witzig
|
2177bf43ca
|
Inject custom CSS and JS files in layout.hbs
|
2017-03-10 11:27:56 +01:00 |
|
witzig
|
ed6d3011f3
|
Enabled GrapeJS and Mosaico
|
2017-03-10 10:00:42 +01:00 |
|
witzig
|
588eed008b
|
GrapeJS and Mosaico Integration
|
2017-03-10 09:59:25 +01:00 |
|
witzig
|
c36071524d
|
Cleanup GrapeJS/Mosaico Templates
|
2017-03-09 11:55:09 +01:00 |
|
witzig
|
abdc822f81
|
Added GrapeJS v0.4.25 to public/grapejs
|
2017-03-09 11:29:58 +01:00 |
|
witzig
|
b9d0da9260
|
Added Mosaico v0.16 to public/mosaico
|
2017-03-09 11:29:58 +01:00 |
|
Andris Reinman
|
745bfb06e3
|
Merge pull request #164 from heroic/listUnsubscribe
Add List-Unsubscribe header
|
2017-03-08 19:30:16 +02:00 |
|
Amit Kumar
|
2056ec4a56
|
Add List-Unsubscribe header
|
2017-03-08 22:55:16 +05:30 |
|
Andris Reinman
|
ab6ed1e505
|
Ensure ordering for custom fields
|
2017-03-08 19:07:51 +02:00 |
|
Andris Reinman
|
6ef9836c14
|
bumped deps
|
2017-03-08 18:37:50 +02:00 |
|