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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		5 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	Add moderation warnings (#9519)	6 years ago
accounts_controller.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
action_logs_controller.rb	…
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	Move #set_user to Admin::BaseController (#9470)	6 years ago
custom_emojis_controller.rb	Add batch actions and categories to admin UI for custom emojis (#11793)	5 years ago
dashboard_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_allows_controller.rb	Add whitelist mode (#11291)	6 years ago
domain_blocks_controller.rb	Add domain block notes (#11515)	5 years ago
email_domain_blocks_controller.rb	…
followers_controller.rb	Fix list of local followers showing remote followers in admin UI (#9700)	6 years ago
instances_controller.rb	Add domain block notes (#11515)	5 years ago
invites_controller.rb	Add admin function to deactivate all invites (#8279)	6 years ago
pending_accounts_controller.rb	Add invite request to pending account notification e-mail (#10528)	6 years ago
relays_controller.rb	Add federation relay support (#7998)	7 years ago
report_notes_controller.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
reported_statuses_controller.rb	Do not error out when performing admin actions on no statuses (#10094)	6 years ago
reports_controller.rb	Add moderation warnings (#9519)	6 years ago
resets_controller.rb	Move #set_user to Admin::BaseController (#9470)	6 years ago
roles_controller.rb	Move #set_user to Admin::BaseController (#9470)	6 years ago
settings_controller.rb	Add validations to admin settings (#10348)	6 years ago
statuses_controller.rb	Add quick links to the admin interface in the WebUI (#8545)	6 years ago
subscriptions_controller.rb	…
tags_controller.rb	Add batch approve/reject for pending hashtags in admin UI (#11791)	5 years ago
two_factor_authentications_controller.rb	Move #set_user to Admin::BaseController (#9470)	6 years ago
warning_presets_controller.rb	Add moderation warnings (#9519)	6 years ago