Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline

2019-10-10 17:26:08 +02:00

..

account_batch.rb

Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)

2019-09-11 16:32:44 +02:00

admin_settings.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-10-10 17:26:08 +02:00

challenge.rb

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

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

custom_emoji_batch.rb

Add batch actions and categories to admin UI for custom emojis (#11793)

2019-09-09 22:44:17 +02:00

delete_confirmation.rb

Fix 2FA challenge and password challenge for non-database users (#11831)

2019-09-15 21:08:39 +02:00

redirect.rb

Add (back) option to set redirect notice on account without moving followers (#11994)

2019-09-29 05:03:19 +02:00

status_batch.rb

Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)

2019-09-11 16:32:44 +02:00

tag_batch.rb

Add batch approve/reject for pending hashtags in admin UI (#11791)

2019-09-09 12:50:09 +02:00

two_factor_confirmation.rb

Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)

2019-09-18 02:48:40 +02:00