queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/controllers/admin
History
Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
2022-02-26 09:29:23 +01:00
..
disputes Add appeals (#17364) 2022-02-14 21:27:53 +01:00
reports Change actions in reports to require only one click (#17487) 2022-02-11 21:51:57 +01:00
trends Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
account_actions_controller.rb
account_moderation_notes_controller.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
accounts_controller.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
action_logs_controller.rb Add ability to filter audit log in admin UI (#13381) 2020-04-03 13:06:34 +02:00
announcements_controller.rb Change order of announcements in admin page to sort them newest-first (#15091) 2020-11-04 21:15:22 +01:00
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb Fix unpermitted operations on custom emojis leading to cryptic errors (#13951) 2020-06-05 15:23:27 +02:00
dashboard_controller.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
domain_allows_controller.rb
domain_blocks_controller.rb Further preparation for Rails 6 (#15916) 2021-03-19 02:45:34 +01:00
email_domain_blocks_controller.rb Change e-mail domain blocks to block IPs dynamically (#17635) 2022-02-24 17:28:23 +01:00
follow_recommendations_controller.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
instances_controller.rb Add ability to purge undeliverable domains from admin interface (#16686) 2021-12-17 23:01:21 +01:00
invites_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
ip_blocks_controller.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
relationships_controller.rb Fix error on account relationships page in admin UI (#17444) 2022-02-05 05:06:34 +01:00
relays_controller.rb
report_notes_controller.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
reports_controller.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
resets_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
roles_controller.rb
rules_controller.rb Add server rules (#15769) 2021-02-21 19:50:12 +01:00
settings_controller.rb
sign_in_token_authentications_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
site_uploads_controller.rb Add ability to delete files uploaded for settings in admin UI (#13192) 2020-03-08 16:00:24 +01:00
statuses_controller.rb Fix empty batch statuses selection causing a 500 error (#17532) 2022-02-12 19:52:17 +01:00
subscriptions_controller.rb
tags_controller.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
two_factor_authentications_controller.rb Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
warning_presets_controller.rb Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00