mastodon/app/controllers/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_controller.rb Redirect to reports overview instead of report after account action (#9639) 2018-12-27 03:42:29 +01:00
account_moderation_notes_controller.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts_controller.rb Improve admin UI for account view (#9643) 2018-12-28 03:38:41 +01:00
action_logs_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
base_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
change_emails_controller.rb Feature: Allow staff to change user emails (#7074) 2018-04-10 09:16:06 +02:00
confirmations_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
custom_emojis_controller.rb keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 2017-12-30 02:43:43 +01:00
dashboard_controller.rb Add instance-wide setting to disable profile directory (#9497) 2018-12-11 19:18:29 +01:00
domain_blocks_controller.rb Redesign admin instances area (#9645) 2019-01-08 13:39:49 +01:00
email_domain_blocks_controller.rb Add logging of admin actions (#5757) 2017-11-24 02:05:53 +01:00
followers_controller.rb Fix list of local followers showing remote followers in admin UI (#9700) 2019-01-03 06:40:16 +01:00
instances_controller.rb Redesign admin instances area (#9645) 2019-01-08 13:39:49 +01:00
invites_controller.rb Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
relays_controller.rb Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
report_notes_controller.rb Feature: Improve reports ui (#7032) 2018-04-10 20:27:59 +02:00
reported_statuses_controller.rb Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
reports_controller.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
resets_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
roles_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
settings_controller.rb Add admin setting to disable followers count 2018-12-20 14:51:12 +01:00
statuses_controller.rb Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
subscriptions_controller.rb Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
tags_controller.rb Fix Admin::TagsController#unhide (#9481) 2018-12-10 21:37:38 +01:00
two_factor_authentications_controller.rb Move #set_user to Admin::BaseController (#9470) 2018-12-17 11:40:51 +01:00
warning_presets_controller.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00