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

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

..

backup_ready.html.haml

…

backup_ready.text.erb

…

confirmation_instructions.html.haml

…

confirmation_instructions.text.erb

…

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

…

password_change.text.erb

…

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

…

reset_password_instructions.html.haml

…

reset_password_instructions.text.erb

…

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

…

warning.text.erb

…

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

…