You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		3 years ago
..
account_actions_controller.rb	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
account_moderation_notes_controller.rb	…
accounts_controller.rb	Add account sensitized (#14361)	3 years ago
action_logs_controller.rb	Add ability to filter audit log in admin UI (#13381)	4 years ago
announcements_controller.rb	Change order of announcements in admin page to sort them newest-first (#15091)	3 years ago
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)	4 years ago
dashboard_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
domain_allows_controller.rb	Add whitelist mode (#11291)	5 years ago
domain_blocks_controller.rb	Further preparation for Rails 6 (#15916)	3 years ago
email_domain_blocks_controller.rb	Improve email address validation (#14565)	4 years ago
follow_recommendations_controller.rb	Add cold-start follow recommendations (#15945)	3 years ago
instances_controller.rb	Add management of delivery availability in Federation settings (#15771)	3 years ago
invites_controller.rb	Various fixes and improvements (#12878)	4 years ago
ip_blocks_controller.rb	Add IP-based rules (#14963)	4 years ago
pending_accounts_controller.rb	…
relationships_controller.rb	Fix relationships page not showing results in admin UI (#12934)	4 years ago
relays_controller.rb	Fix relays UI being available in whitelist/secure mode (#11963)	5 years ago
report_notes_controller.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
reported_statuses_controller.rb	…
reports_controller.rb	Various fixes and improvements (#12878)	4 years ago
resets_controller.rb	Add ability to skip sign-in token authentication for specific users (#16427)	3 years ago
roles_controller.rb	…
rules_controller.rb	Add server rules (#15769)	3 years ago
settings_controller.rb	…
sign_in_token_authentications_controller.rb	Add ability to skip sign-in token authentication for specific users (#16427)	3 years ago
site_uploads_controller.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	4 years ago
statuses_controller.rb	Further improve the media attached status query for accounts (#16106)	3 years ago
subscriptions_controller.rb	…
tags_controller.rb	Fix /admin/tags/:id crashing since Rails 6.1 update (#15953)	3 years ago
two_factor_authentications_controller.rb	Add ability to skip sign-in token authentication for specific users (#16427)	3 years ago
warning_presets_controller.rb	Add titles to warning presets in admin UI (#13252)	4 years ago