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 48e6b2360d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		6 years ago
..
account_actions	Add moderation warnings (#9519)	6 years ago
account_moderation_notes	Improve admin UI for accounts (#7360)	7 years ago
account_warnings	Add moderation warnings (#9519)	6 years ago
accounts	Add moderation warnings (#9519)	6 years ago
action_logs	Improve report layout (#7188)	7 years ago
change_emails	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
custom_emojis	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
dashboard	Add instance-wide setting to disable profile directory (#9497)	6 years ago
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
email_domain_blocks	Add option to block reports from domain (#8830)	6 years ago
instances	Add option to block reports from domain (#8830)	6 years ago
invites	Add admin function to deactivate all invites (#8279)	6 years ago
relays	Display pending message on admin relays UI (#8494)	6 years ago
report_notes	Improve report layout (#7188)	7 years ago
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Add admin setting to disable followers count	6 years ago
statuses	Allow to show a specific status in the admin interface	6 years ago
subscriptions	Scrollable tables in settings pages (#4857)	7 years ago
tags	Add profile directory (#9427)	6 years ago
warning_presets	Add moderation warnings (#9519)	6 years ago