You cannot 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 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		6 years ago
..
account_actions_controller.rb	Add option to include reported statuses in warning e-mail (#11639)	7 years ago
account_moderation_notes_controller.rb	Add moderation warnings (#9519)	7 years ago
accounts_controller.rb	Various fixes and improvements (#12878)	6 years ago
action_logs_controller.rb	Add ability to filter audit log in admin UI (#13381)	6 years ago
announcements_controller.rb	Add publish/unpublish controls to announcements in admin UI (#12967)	6 years ago
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
change_emails_controller.rb	Feature: Allow staff to change user emails (#7074)	8 years ago
confirmations_controller.rb	Move #set_user to Admin::BaseController (#9470)	7 years ago
custom_emojis_controller.rb	Fix unpermitted operations on custom emojis leading to cryptic errors (#13951)	6 years ago
dashboard_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
domain_allows_controller.rb	Add whitelist mode (#11291)	7 years ago
domain_blocks_controller.rb	Add domain block notes (#11515)	7 years ago
email_domain_blocks_controller.rb	Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)	6 years ago
instances_controller.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	6 years ago
invites_controller.rb	Various fixes and improvements (#12878)	6 years ago
pending_accounts_controller.rb	Add invite request to pending account notification e-mail (#10528)	7 years ago
relationships_controller.rb	Fix relationships page not showing results in admin UI (#12934)	6 years ago
relays_controller.rb	Fix relays UI being available in whitelist/secure mode (#11963)	6 years ago
report_notes_controller.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	6 years ago
reported_statuses_controller.rb	Do not error out when performing admin actions on no statuses (#10094)	7 years ago
reports_controller.rb	Various fixes and improvements (#12878)	6 years ago
resets_controller.rb	Move #set_user to Admin::BaseController (#9470)	7 years ago
roles_controller.rb	Move #set_user to Admin::BaseController (#9470)	7 years ago
settings_controller.rb	Add validations to admin settings (#10348)	7 years ago
site_uploads_controller.rb	Add ability to delete files uploaded for settings in admin UI (#13192)	6 years ago
statuses_controller.rb	Add quick links to the admin interface in the WebUI (#8545)	7 years ago
subscriptions_controller.rb	…
tags_controller.rb	Various fixes and improvements (#12878)	6 years ago
two_factor_authentications_controller.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	6 years ago
warning_presets_controller.rb	Add titles to warning presets in admin UI (#13252)	6 years ago