David Yip
87517e2dd8
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/views/layouts/mailer.html.haml
config/locales/ko.yml
7 years ago
Eugen Rochko
6278ffdba3
Add direction tags to HTML e-mails for RTL languages ( #6373 )
7 years ago
David Yip
03f157f6da
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
Eugen Rochko
896cadceed
Improve HTML e-mails based on Litmus tests ( #6301 )
...
* Use PNG images in HTML e-mails
* Make webpack use URLs with host so fonts load inside HTML e-mails
Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker
* Improve responsive design
* Add missing PNG icon
7 years ago
Jenkins
8c41fb4acc
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi
d60d5fbd26
Change image URL in mailer to full path ( #6264 )
7 years ago
kibi!
be525dd4db
Fix mailer to use webpack core
7 years ago
Eugen Rochko
9613c3238c
HTML e-mails for UserMailer ( #6256 )
...
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
7 years ago