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 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock		5 years ago
..
account_actions	Add moderation warnings (#9519)	6 years ago
account_moderation_notes	Improve admin UI for accounts (#7360)	7 years ago
account_warnings	Add moderation warnings (#9519)	6 years ago
accounts	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	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	Redesign forms, verify link ownership with rel="me" (#8703)	6 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	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	Add whitelist mode (#11291)	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 profile directory (#9427)	6 years ago
warning_presets	Add moderation warnings (#9519)	6 years ago