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 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.		6 years ago
..
account_moderation_notes	Improve admin UI for accounts (#7360)	6 years ago
accounts	Add confirmation step to account suspensions (#8353)	6 years ago
action_logs	Improve report layout (#7188)	6 years ago
change_emails	Feature: Allow staff to change user emails (#7074)	6 years ago
custom_emojis	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	6 years ago
dashboard	Fix tag usage display on admin dashboard	6 years ago
domain_blocks	Hide reject media checkbox when not relevant. (#8426)	6 years ago
email_domain_blocks	Fix style of email domain block table (#5218)	7 years ago
instances	Add instance search feature (#4925)	7 years ago
invites	Add admin function to deactivate all invites (#8279)	6 years ago
relays	Add federation relay support (#7998)	6 years ago
report_notes	Improve report layout (#7188)	6 years ago
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
statuses	Merge branch 'master' into glitch-soc/master	6 years ago
subscriptions	Scrollable tables in settings pages (#4857)	7 years ago
suspensions	Add confirmation step to account suspensions (#8353)	6 years ago