]> cat aescling's git repositories - mastodon.git/commit
HTML e-mails for UserMailer (#6256)
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 16 Jan 2018 02:29:11 +0000 (03:29 +0100)
committerGitHub <noreply@github.com>
Tue, 16 Jan 2018 02:29:11 +0000 (03:29 +0100)
commit5276c0a0900a0886b59a8ead2346540aa381ea46
treefbc338f77623f670b6421b87606028a68fb68bd5
parent7861c5f108a8f8cb0450f3b1ef865b1177c706fc
HTML e-mails for UserMailer (#6256)

- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
104 files changed:
Gemfile
Gemfile.lock
app/helpers/mailer_helper.rb [new file with mode: 0644]
app/javascript/images/icon_email.svg [new file with mode: 0644]
app/javascript/images/icon_lock_open.svg [new file with mode: 0644]
app/javascript/images/logo_transparent.svg [new file with mode: 0644]
app/javascript/packs/mailer.js [new file with mode: 0644]
app/javascript/styles/mailer.scss [new file with mode: 0644]
app/mailers/admin_mailer.rb
app/mailers/application_mailer.rb
app/mailers/notification_mailer.rb
app/views/layouts/mailer.html.haml [new file with mode: 0644]
app/views/layouts/plain_mailer.html.haml [new file with mode: 0644]
app/views/user_mailer/confirmation_instructions.ar.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.ca.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.en.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.es.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.fa.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.fi.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.fr.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.he.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.html.haml [new file with mode: 0644]
app/views/user_mailer/confirmation_instructions.id.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.it.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.ja.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.ko.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.nl.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.no.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.oc.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.pl.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.pt-BR.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.ru.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.sr-Latn.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.sr.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.sv.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.tr.html.erb [deleted file]
app/views/user_mailer/confirmation_instructions.zh-cn.html.erb [deleted file]
app/views/user_mailer/email_changed.en.html.erb [deleted file]
app/views/user_mailer/email_changed.html.haml [new file with mode: 0644]
app/views/user_mailer/email_changed.ja.html.erb [deleted file]
app/views/user_mailer/email_changed.oc.html.erb [deleted file]
app/views/user_mailer/email_changed.pl.html.erb [deleted file]
app/views/user_mailer/email_changed.zh-cn.html.erb [deleted file]
app/views/user_mailer/password_change.ar.html.erb [deleted file]
app/views/user_mailer/password_change.ca.html.erb [deleted file]
app/views/user_mailer/password_change.en.html.erb [deleted file]
app/views/user_mailer/password_change.es.html.erb [deleted file]
app/views/user_mailer/password_change.fa.html.erb [deleted file]
app/views/user_mailer/password_change.fi.html.erb [deleted file]
app/views/user_mailer/password_change.fr.html.erb [deleted file]
app/views/user_mailer/password_change.he.html.erb [deleted file]
app/views/user_mailer/password_change.html.haml [new file with mode: 0644]
app/views/user_mailer/password_change.id.html.erb [deleted file]
app/views/user_mailer/password_change.it.html.erb [deleted file]
app/views/user_mailer/password_change.ja.html.erb [deleted file]
app/views/user_mailer/password_change.nl.html.erb [deleted file]
app/views/user_mailer/password_change.no.html.erb [deleted file]
app/views/user_mailer/password_change.oc.html.erb [deleted file]
app/views/user_mailer/password_change.pl.html.erb [deleted file]
app/views/user_mailer/password_change.pt-BR.html.erb [deleted file]
app/views/user_mailer/password_change.ru.html.erb [deleted file]
app/views/user_mailer/password_change.sr-Latn.html.erb [deleted file]
app/views/user_mailer/password_change.sr.html.erb [deleted file]
app/views/user_mailer/password_change.sv.html.erb [deleted file]
app/views/user_mailer/password_change.th.html.erb [deleted file]
app/views/user_mailer/password_change.tr.html.erb [deleted file]
app/views/user_mailer/password_change.zh-cn.html.erb [deleted file]
app/views/user_mailer/reconfirmation_instructions.en.html.erb [deleted file]
app/views/user_mailer/reconfirmation_instructions.html.haml [new file with mode: 0644]
app/views/user_mailer/reconfirmation_instructions.ja.html.erb [deleted file]
app/views/user_mailer/reconfirmation_instructions.oc.html.erb [deleted file]
app/views/user_mailer/reconfirmation_instructions.pl.html.erb [deleted file]
app/views/user_mailer/reconfirmation_instructions.zh-cn.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.ar.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.ca.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.en.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.es.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.fa.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.fi.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.fr.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.he.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.html.haml [new file with mode: 0644]
app/views/user_mailer/reset_password_instructions.id.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.it.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.ja.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.nl.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.no.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.oc.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.pl.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.pt-BR.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.ru.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.sr-Latn.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.sr.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.sv.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.th.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.tr.html.erb [deleted file]
app/views/user_mailer/reset_password_instructions.zh-cn.html.erb [deleted file]
config/initializers/assets.rb
config/initializers/premailer_rails.rb [new file with mode: 0644]
config/locales/devise.en.yml
config/locales/en.yml
lib/mastodon/premailer_webpack_strategy.rb [new file with mode: 0644]
spec/mailers/previews/notification_mailer_preview.rb
spec/mailers/previews/user_mailer_preview.rb [new file with mode: 0644]