Darius Kazemi 877a478466 Merge tag 'v3.1.4' into hometown-dev

2020-05-15 15:34:04 -07:00

..

backup_ready.html.haml

Swapping out Mastodon for site title in sessions, noscript and backup confirmation message

2019-09-13 01:09:33 +01:00

backup_ready.text.erb

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

confirmation_instructions.html.haml

Bump webpacker from 3.5.5 to 4.0.2 (#10277)

2019-03-15 15:05:31 +01:00

confirmation_instructions.text.erb

Admission-based registrations mode (#10250)

2019-03-14 05:28:30 +01:00

email_changed.html.haml

Fix “Email changed” notification sometimes having wrong e-mail (#13475)

2020-04-15 16:13:44 +02:00

email_changed.text.erb

Fix “Email changed” notification sometimes having wrong e-mail (#13475)

2020-04-15 16:13:44 +02:00

password_change.html.haml

Bump webpacker from 3.5.5 to 4.0.2 (#10277)

2019-03-15 15:05:31 +01:00

password_change.text.erb

Make text e-mails consistent with HTML ones in UserMailer (#6291)

2018-01-20 01:32:05 +01:00

reconfirmation_instructions.html.haml

All 'Mastodon' references in emails (except unlock_instructions) changed to instance title

2019-09-16 21:02:08 +01:00

reconfirmation_instructions.text.erb

Make text e-mails consistent with HTML ones in UserMailer (#6291)

2018-01-20 01:32:05 +01:00

reset_password_instructions.html.haml

Bump webpacker from 3.5.5 to 4.0.2 (#10277)

2019-03-15 15:05:31 +01:00

reset_password_instructions.text.erb

Make text e-mails consistent with HTML ones in UserMailer (#6291)

2018-01-20 01:32:05 +01:00

two_factor_disabled.html.haml

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

two_factor_disabled.text.erb

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

two_factor_enabled.html.haml

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

two_factor_enabled.text.erb

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

two_factor_recovery_codes_changed.html.haml

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

two_factor_recovery_codes_changed.text.erb

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

warning.html.haml

Fix nil error in warning e-mail template (#11812)

2019-09-12 01:51:01 +02:00

warning.text.erb

Fix error in user warning template (#11741)

2019-09-03 05:57:30 +02:00

welcome.html.haml

Changing some mentions of 'Mastodon' to either be specific to the instance or general to the fediverse

2019-09-13 01:43:51 +01:00

welcome.text.erb

Remove links to bridge.joinmastodon.org (non-functional) (#9608)

2018-12-22 23:32:00 +01:00