fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 23:01:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/controllers/admin
History
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02: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 Add moderation API (#9387) 2019-06-20 02:52:34 +02:00
action_logs_controller.rb
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 Randomize emoji filename (#10090) 2019-02-22 16:52:04 +01:00
dashboard_controller.rb Fix keybase indication on dashboard 2019-04-19 00:57:39 +02:00
domain_blocks_controller.rb Change domain blocks to automatically support subdomains (#11138) 2019-06-22 00:13:10 +02:00
email_domain_blocks_controller.rb
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 Change domain blocks to automatically support subdomains (#11138) 2019-06-22 00:13:10 +02:00
invites_controller.rb Add admin function to deactivate all invites (#8279) 2018-08-19 00:58:53 +02:00
pending_accounts_controller.rb Add invite request to pending account notification e-mail (#10528) 2019-04-10 00:36:01 +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 Do not error out when performing admin actions on no statuses (#10094) 2019-02-21 19:36:48 +01: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 validations to admin settings (#10348) 2019-03-23 14:07:04 +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
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