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 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		5 years ago
..
account_actions	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
account_moderation_notes	…
account_warnings	Add moderation warnings (#9519)	6 years ago
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 announcements (#12662)	5 years ago
change_emails	Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)	6 years ago
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	Display pending message on admin relays UI (#8494)	6 years ago
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	Add quick links to the admin interface in the WebUI (#8545)	6 years ago
tags	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
warning_presets	Add moderation warnings (#9519)	6 years ago