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 |
|
Andris Reinman
|
96292bfe05
|
Merge pull request #162 from Minimalistic/patch-1
Addition of Table of Contents with relative links
|
2017-03-08 18:21:32 +02:00 |
|
Jason Marsh
|
2c74d7044a
|
Addition of Table of Contents
|
2017-03-08 10:04:27 -06:00 |
|
Andris Reinman
|
63ae26a0a7
|
Merge pull request #153 from witzig/move-wallet
Moved Bitcoin wallet out of mailtrain.pot
|
2017-03-08 06:25:04 +02:00 |
|
Andris Reinman
|
9332f2b60b
|
Merge pull request #155 from heroic/master
Fixes #154
|
2017-03-08 06:24:09 +02:00 |
|
Amit Kumar
|
8863d67679
|
Merge pull request #1 from heroic/fixBrokenTag
Fix broken tag
|
2017-03-08 09:47:54 +05:30 |
|
Amit Kumar
|
6174fe9c83
|
Fix broken tag
|
2017-03-08 09:47:11 +05:30 |
|
witzig
|
97d758b039
|
Moved Bitcoin wallet out of translation
|
2017-03-07 20:59:09 +01:00 |
|
Andris Reinman
|
37531f2550
|
Merge branch 'master' of github.com:andris9/mailtrain
|
2017-03-07 16:31:34 +02:00 |
|
Andris Reinman
|
5d7e3b69fb
|
Merge pull request #150 from witzig/tracking-code-partial
Moved tracking scripts to partial and made tools.formatMessage() less…
|
2017-03-07 16:31:19 +02:00 |
|
Andris Reinman
|
573a6d44ff
|
Merge pull request #149 from witzig/master
Temporary fix for #148
|
2017-03-07 16:31:12 +02:00 |
|
Andris Reinman
|
d25565b6f8
|
Updated translation support
|
2017-03-07 16:30:56 +02:00 |
|
Andris Reinman
|
b1e8cd68cd
|
Merge branch 'master' of github.com:andris9/mailtrain
|
2017-03-07 11:43:56 +02:00 |
|
witzig
|
a164a7fb40
|
Moved tracking scripts to partial and made tools.formatMessage() less greedy
The change in tools.formatMessage() prevents stripping CSS like
a[data-foo] and arrays in JS. Thus only replacing mergeTag it knows
about.
|
2017-03-06 14:52:22 +01:00 |
|
Andris Reinman
|
89f480d5f8
|
fixed dependencies
|
2017-03-06 10:48:08 +02:00 |
|
witzig
|
4c2f3a548c
|
Temporary fix for #148
|
2017-03-05 01:54:09 +01:00 |
|
Andris Reinman
|
1c38a1a7bb
|
Merge pull request #147 from witzig/master
Moved Merge Tag Helpers to helpers.js
|
2017-03-04 23:34:36 +02:00 |
|
witzig
|
28c08cf847
|
Update helpers.js
|
2017-03-04 22:04:13 +01:00 |
|
witzig
|
66dc1091a8
|
Merge remote-tracking branch 'upstream/master'
|
2017-03-04 21:52:10 +01:00 |
|
witzig
|
8fdb2840c4
|
Moved Merge Tag Helpers to helpers.js
… to satisfy ESLint top-level module scope.
|
2017-03-04 21:50:44 +01:00 |
|
Andris Reinman
|
bd6ba90eca
|
Added 'created' column for subscribers lists table
|
2017-03-04 22:02:46 +02:00 |
|
Andris Reinman
|
435de82819
|
Merge pull request #145 from witzig/master
Merge tag reference abstraction/partial
|
2017-03-04 21:50:03 +02:00 |
|