Age | Commit message (Collapse) | Author |
|
|
|
It is required for ApplicationController.
|
|
Conflicts:
app/views/layouts/mailer.html.haml
config/locales/ko.yml
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/javascript/styles/mastodon/components.scss
|
|
|
|
* Use PNG images in HTML e-mails
* Make webpack use URLs with host so fonts load inside HTML e-mails
Convert this back to a relative URL in the premailer CSS loader
since local requests are quicker
* Improve responsive design
* Add missing PNG icon
|
|
Conflicts:
app/javascript/styles/mastodon/components.scss
app/javascript/styles/mastodon/modal.scss
|
|
* Fix regeneration key not getting expired
* Add rake task to remove old regeneration markers
|
|
Conflicts:
Gemfile.lock
|
|
- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Add rake task to check and purge accounts that are missing in origin
* Add progress bar and --force options to mastodon:maintenance:purge_removed_accounts
|
|
|
|
prevent federation of local-only statuses
|
|
2.1.0. -> 2.1.0
|
|
Conflicts:
db/schema.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|