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.

Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.		6 years ago
..
account_moderation_notes_controller.rb	Add logging of admin actions (#5757)	7 years ago
accounts_controller.rb	Change admin accounts default sort to most recent (#8813)	6 years ago
action_logs_controller.rb	Add logging of admin actions (#5757)	7 years ago
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
change_emails_controller.rb	Feature: Allow staff to change user emails (#7074)	7 years ago
confirmations_controller.rb	Add resend confirmation for admin (#7378)	7 years ago
custom_emojis_controller.rb	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
dashboard_controller.rb	Display trending hashtags on admin dashboard (#8038)	6 years ago
domain_blocks_controller.rb	Add option to block reports from domain (#8830)	6 years ago
email_domain_blocks_controller.rb	Add logging of admin actions (#5757)	7 years ago
instances_controller.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
invites_controller.rb	Add admin function to deactivate all invites (#8279)	6 years ago
relays_controller.rb	Add federation relay support (#7998)	6 years ago
report_notes_controller.rb	Feature: Improve reports ui (#7032)	7 years ago
reported_statuses_controller.rb	Improve admin UI for accounts (#7360)	7 years ago
reports_controller.rb	Add "disable" button to report screen (#9024)	6 years ago
resets_controller.rb	Add logging of admin actions (#5757)	7 years ago
roles_controller.rb	Add logging of admin actions (#5757)	7 years ago
settings_controller.rb	Allow selecting both default flavour and theme	6 years ago
silences_controller.rb	Add logging of admin actions (#5757)	7 years ago
statuses_controller.rb	Allow to show a specific status in the admin interface	6 years ago
subscriptions_controller.rb	Add moderator role and add pundit policies for admin actions (#5635)	7 years ago
suspensions_controller.rb	Fix regression when suspending not from report (#8400)	6 years ago
two_factor_authentications_controller.rb	Add logging of admin actions (#5757)	7 years ago