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 c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.		5 years ago
..
account_actions	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
account_moderation_notes	…
account_warnings	…
accounts	Fix relationships page not showing results in admin UI (#12934)	5 years ago
action_logs	Use local time in audit log (#10751)	6 years ago
announcements	Add publish/unpublish controls to announcements in admin UI (#12967)	5 years ago
change_emails	…
custom_emojis	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dashboard	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_allows	Fix upstream changes breaking because of glitch-soc's theming engine	5 years ago
domain_blocks	Fix domain block edition in glitch-soc	5 years ago
email_domain_blocks	Various fixes and improvements (#12878)	5 years ago
instances	Various fixes and improvements (#12878)	5 years ago
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	6 years ago
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
relationships	Change followers page to relationships page in admin UI (#12927)	5 years ago
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Fix issue because of theming system	5 years ago
statuses	…
tags	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
warning_presets	…