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 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		5 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 domain block notes (#11515)	5 years ago
action_logs	Use local time in audit log (#10751)	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	…
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	…
followers	Fix admin UI view of local followers (#9712)	6 years ago
instances	Add domain block notes (#11515)	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	5 years ago
relays	…
report_notes	…
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	Fix weekly usage not being displayed correctly in hashtag admin UI (#11524)	5 years ago
warning_presets	Add moderation warnings (#9519)	6 years ago