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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		5 years ago
..
account_actions	Add option to include reported statuses in warning e-mail (#11639)	5 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 account bio to account admin view (#11473)	5 years ago
action_logs	Use local time in audit log (#10751)	6 years ago
change_emails	Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)	6 years ago
custom_emojis	Change /admin/custom_emoji to honor the auto_play_gif setting (#11801)	5 years ago
dashboard	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_allows	Add whitelist mode (#11291)	5 years ago
domain_blocks	Fix domain block edition in glitch-soc	5 years ago
email_domain_blocks	Add option to block reports from domain (#8830)	6 years ago
followers	Fix admin UI view of local followers (#9712)	6 years ago
instances	Fix admin interface showing superfluous reject media/reports on suspended blocks (#11749)	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
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	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
statuses	Add quick links to the admin interface in the WebUI (#8545)	6 years ago
tags	Add batch approve/reject for pending hashtags in admin UI (#11791)	5 years ago
warning_presets	Add moderation warnings (#9519)	6 years ago