Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.

2021-12-16 16:20:44 +01:00

..

trends

Add trending links (#16917)

2021-11-25 13:07:38 +01:00

account_actions_controller.rb

Add option to include reported statuses in warning e-mail (#11639)

2019-08-23 22:37:23 +02:00

account_moderation_notes_controller.rb

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

accounts_controller.rb

Add batch suspend for accounts in admin UI (#17009)

2021-12-05 21:48:39 +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

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

Fix unpermitted operations on custom emojis leading to cryptic errors (#13951)

2020-06-05 15:23:27 +02:00

dashboard_controller.rb

Add trending links (#16917)

2021-11-25 13:07:38 +01:00

domain_allows_controller.rb

Add whitelist mode (#11291)

2019-07-30 11:10:46 +02:00

domain_blocks_controller.rb

Further preparation for Rails 6 (#15916)

2021-03-19 02:45:34 +01:00

email_domain_blocks_controller.rb

Improve email address validation (#14565)

2020-08-12 12:40:25 +02:00

follow_recommendations_controller.rb

Add cold-start follow recommendations (#15945)

2021-04-12 12:37:14 +02:00

instances_controller.rb

Add management of delivery availability in Federation settings (#15771)

2021-05-05 23:39:02 +02: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 relationships page not showing results in admin UI (#12934)

2020-01-24 00:20:23 +01:00

relays_controller.rb

Fix relays UI being available in whitelist/secure mode (#11963)

2019-09-27 02:13:34 +02:00

report_notes_controller.rb

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

2019-09-11 16:32:44 +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

Various fixes and improvements (#12878)

2020-01-20 15:55:03 +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

Move #set_user to Admin::BaseController (#9470)

2018-12-17 11:40:51 +01:00

rules_controller.rb

Add server rules (#15769)

2021-02-21 19:50:12 +01:00

settings_controller.rb

Add validations to admin settings (#10348)

2019-03-23 14:07:04 +01:00

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 admin statuses order(#16937) (#16969)

2021-11-26 22:12:27 +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

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