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 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb		6 years ago
..
account_actions	Add moderation warnings (#9519)	6 years ago
account_moderation_notes	…
account_warnings	Add moderation warnings (#9519)	6 years ago
accounts	Add batch actions for approving and rejecting pending accounts (#10469)	6 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	…
dashboard	Fix keybase indication on dashboard	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
followers	Fix admin UI view of local followers (#9712)	6 years ago
instances	Improve performance of list of blocked domains by caching counts (#10374)	6 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	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Add site-wide options to show reblogs and replies in local/public timelines	6 years ago
statuses	Add quick links to the admin interface in the WebUI (#8545)	6 years ago
subscriptions	…
tags	Add profile directory (#9427)	6 years ago
warning_presets	Add moderation warnings (#9519)	6 years ago