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 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		6 years ago
..
account_moderation_notes_controller.rb	Add logging of admin actions (#5757)	7 years ago
accounts_controller.rb	Add admin ability to remove an user's header image (#9495)	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	Add instance-wide setting to disable profile directory (#9497)	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	Extract counters from accounts table to account_stats table (#9295)	6 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	Merge branch 'master' into glitch-soc/merge-upstream	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
tags_controller.rb	Fix Admin::TagsController#unhide (#9481)	6 years ago
two_factor_authentications_controller.rb	Add logging of admin actions (#5757)	7 years ago