mastodon/app/views/admin
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
2019-01-10 21:00:30 +01:00
..
account_actions Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
account_moderation_notes Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
account_warnings Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
action_logs Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
change_emails Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
custom_emojis Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
dashboard Add instance-wide setting to disable profile directory (#9497) 2018-12-11 19:18:29 +01:00
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
email_domain_blocks Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
followers Fix admin UI view of local followers (#9712) 2019-01-04 11:28:14 +01:00
instances Change "federation" admin UI link to point to "limited" domains (#9762) 2019-01-08 17:41:27 +01:00
invites Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
relays Display pending message on admin relays UI (#8494) 2018-08-28 05:39:43 +02:00
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
settings Add admin setting to disable followers count 2018-12-20 14:51:12 +01:00
statuses Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
subscriptions Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
tags Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
warning_presets Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00