Commit graph

147 commits

Author SHA1 Message Date
vladimir
c9136f8abd Add blacklist function 2017-04-11 10:10:02 +02:00
witzig
bc669c1e05 Remove pencil icon from GrapeJS image toolbar, #195 2017-04-07 23:12:01 +02:00
witzig
60907c0d86 Subscription Widget 2017-04-03 20:42:04 +02:00
witzig
52bbdb1a09 Fixed NodeList.forEach (and some refactoring) 2017-04-02 13:58:42 +02:00
vladimir
1547e887c3 Add option to disable email cheking for imported CSV 2017-03-31 11:20:43 +02:00
Andris Reinman
47705c212d Replaced andris9 with Mailtrain-org 2017-03-23 15:47:00 +02:00
witzig
56f621079f Updated Screenshots 2017-03-21 10:53:35 +01:00
witzig
038c8f4adb Fix closing tag 2017-03-21 10:26:26 +01:00
witzig
0e7f85f13e Add .logged-in and .user-username to body 2017-03-21 10:24:48 +01:00
vladimir
3152ecb228 Merge remote-tracking branch 'upstream/master' into clicks-by-device-type 2017-03-21 10:26:50 +02:00
vladimir
97d5d1a462 Replace if-else with unless function in clicked view 2017-03-21 00:16:50 +02:00
witzig
9f68fe9cbb Removed defaultPostaddress from subscription footer 2017-03-20 22:39:13 +01:00
witzig
8852f33f03 Added note about MJML usage 2017-03-20 22:32:32 +01:00
vladimir
e3cb6ca679 Fix formating and rewrite migration script 2017-03-20 21:50:53 +02:00
vladimir
7d768ebd48 Fix link.id in opened links 2017-03-20 16:53:13 +02:00
vladimir
1ba3bce6eb Add device type detect and stats calculation for open/click rate by device type and country 2017-03-20 14:44:17 +02:00
witzig
477aff95d5 Moved scripts out of layout.mjml.hbs 2017-03-19 16:14:31 +01:00
witzig
2e50fbc8ae Custom Forms 2017-03-19 13:36:57 +01: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
a2450507c6 Rename index-2.hbs to index.hbs 2017-03-12 01:10:08 +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
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
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
witzig
adf183856f Moved delivered count into stats section 2017-03-11 09:52:12 +01: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
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
witzig
2177bf43ca Inject custom CSS and JS files in layout.hbs 2017-03-10 11:27:56 +01:00
witzig
588eed008b GrapeJS and Mosaico Integration 2017-03-10 09:59:25 +01: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
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
d25565b6f8 Updated translation support 2017-03-07 16:30: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
witzig
4c2f3a548c Temporary fix for #148 2017-03-05 01:54:09 +01:00
Andris Reinman
bd6ba90eca Added 'created' column for subscribers lists table 2017-03-04 22:02:46 +02:00
witzig
d9c1d8e595 Merge remote-tracking branch 'upstream/master' 2017-03-04 18:38:44 +01:00
witzig
633463108e Merge tag reference abstraction/partial
Perhaps helpers.js would be a more suitable place for
getDefaultMergeTags() and getListMergeTags() … ?
2017-03-04 18:37:41 +01:00
Andris Reinman
ba8bd12123 initial translations support 2017-03-04 18:15:16 +02:00
witzig
fa9a3de863 Update editor-bridge.hbs 2017-03-02 21:53:07 +01:00
witzig
a11d95f3d7 Support for custom HTML editors 2017-03-02 19:30:40 +01:00