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

19 Commits (c946ba3faeddd181d23a75342a487fbcf992f027)

Author SHA1 Message Date
abcang c156a83e7d Make sure status is not nil ()
Eugen Rochko 02194838dd
HTML e-mails for NotificationMailer () 
* HTML e-mails for NotificationMailer (except digest)

* Add HTML template for digest

* Fix build
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer () 
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
Yamagishi Kazutoshi b21db9bbde Using double splat operator ()
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial () 
Fix
ThibG c267acfcf7 Thread toot notification mails by conversation () 
* Thread toot notification mails by conversation

* Make codeclimate happy and avoid potential mis-threading
Eugen Rochko 42b8220632 Fix - Send e-mail notifications to admins about new reports ()
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 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
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 da2ef4d676 Adding unified streamable notifications
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