aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,714 Commits
135 Branches
281 Tags
1.0 GiB
Commit Graph

26 Commits (fef66254968a53716ee1edcbcb57ac8b636080a2)

Author SHA1 Message Date
Yamagishi Kazutoshi b21db9bbde Using double splat operator ()
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial () 
Fix
Ryo Kajiwara d5091387c6 Supply @instance variable in password reset instructions / password change mailer ()
ThibG c267acfcf7 Thread toot notification mails by conversation () 
* Thread toot notification mails by conversation

* Make codeclimate happy and avoid potential mis-threading
Akihiko Odaki (@fn_aki@pawoo.net) 2083000027 Set default From address in config () 
The old implementation sets default From address in mailers. It sets
the address from SMTP_FROM_ADDRESS, or notifications@localhost. The
behavior is occasionally undesired results.

In production environment, notifications@localhost is likely to be
incorrect.
In testing environment, the email address should not be varied by a
environment variable.

After appling this change,

In production environment, it will throw an exception when launching
Mastodon.
In testing environment, the address will be fixed with
notifications@localhost.
Yamagishi Kazutoshi 3a7106f05a Fix that AdminMailer does not send ()
Eugen Rochko 42b8220632 Fix - Send e-mail notifications to admins about new reports ()
Yamagishi Kazutoshi e6fbf0334f Remove unnecessary .keep files () 
Follow up
Matt Jankowski 7a7d12d27f Delegate Account#user_locale method and allow nil ()
Matt Jankowski 484c9709b6 Misc spec coverage improvements () 
* Dont use raise_error by itself (avoids warning)

* Add coverage for AccountFilter

* Improve coverage and refactor for Subscription#lease_seconds

* Improve coverage and refactor for NotificationMailer

* Simplify assignment of min/max threshold on subscription
yhirano 3988f2dade Fix Rubocop offences () 
* disable Bundler/OrderedGems

* fix rubocop Lint/UselessAssignment

* fix rubocop Style/BlockDelimiters

* fix rubocop Style/AlignHash

* fix rubocop Style/AlignParameters, Style/EachWithObject

* fix rubocop Style/SpaceInLambdaLiteral
Matt Jankowski 389f8f8249 Instance helper to replace site title helper () 
* Move site title helper to instance helper (name change only)

* Remove newline in <title> tag

* Add site_hostname helper method to wrap up local_domain value

* Use site_hostname helper in places that need local_domain value
Matt Jankowski f87b51fda8 I18n health warnings () 
* Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement

* Use implicit controller/action path for i18n in admin/domain_blocks

* Add DomainBlock#accounts has_many

* Avoid i18n health warning for `en` locale by using symbol scope with :count

* Remove unused i18n key: plaintext_secret_html

* Remove unused i18n key two_factor_auth.warning

* Remove final will_paginate i18n keys

* Remove unused key two_factor_auth.recovery_codes

* Remove unused key: admin.reports.comment.none

* Remove unused reports. i18n namespace (moved to admin.reports)

* Ignore keys from locales which override activemodel and activerecord errors

* Revert "Remove unused key: admin.reports.comment.none"

This reverts commit 350ef2685f.

* Update i18n key reference to match moved location

* Add missing `en` keys to i18n

* Tell i18n-tasks to ignore missing attributes that dont need overwriting

* Add i18n-tasks unused to travis
Thomas Citharel d90d23699c Make Reporting admin section translatable () 
* Make Reporting admin section translatable

And translate it into english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Make subject of emails translatable and improve french translation

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Make error pages translatable and translate them in english and french

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Translate site setting section

* Insert instance in registration emails and improve them a bit

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Eugen Rochko 6b81d10030 Add digest e-mails
Eugen Rochko 2146ac91a0 Follow requests send e-mail notifications, but are excluded from notifications API 
Better initial state for unlisted/nsfw toggles
Eugen Rochko b191afcb5b Fix confirmation email being sent to old address when changing it
Eugen Rochko da2ef4d676 Adding unified streamable notifications
Eugen Rochko 7ac574d9a9 Fix - Devise mailer fixed, test spec added so it won't slip past again
Eugen Rochko 116ab27e08 i18n for devise mailer too
Eugen Rochko 2c766bd4b4 Add user locale setting
Eugen Rochko 546c4718e7 Localizations for most server-side strings
Eugen Rochko fdc17bea58 Fix rubocop issues, introduce usage of frozen literal to improve performance
Eugen Rochko 06016453bd Adding user settings (model and mailer), no form yet
Eugen Rochko 2b116131d7 Adding e-mail notifications about mentions, follows, favourites and reblogs. Fixing another mention recording bug
Eugen Rochko 9c4856bdb1 Initial commit