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 ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		4 years ago
..
account_actions	Add titles to warning presets in admin UI (#13252)	4 years ago
account_moderation_notes	Improve admin UI for accounts (#7360)	6 years ago
account_warnings	Add moderation warnings (#9519)	5 years ago
accounts	Fix method of the DELETE DATA button (#14855)	4 years ago
action_logs	Fix admin audit log crash due to glitch-soc theming changes	4 years ago
announcements	Fix design of announcements in admin UI (#12989)	4 years ago
change_emails	Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)	5 years ago
custom_emojis	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
dashboard	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_allows	Fix upstream changes breaking because of glitch-soc's theming engine	5 years ago
domain_blocks	Fix domain block edition in glitch-soc	5 years ago
email_domain_blocks	Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)	4 years ago
instances	Improve appearence consistency of settings pages (#13938)	4 years ago
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	5 years ago
ip_blocks	Add IP-based rules (#14963)	4 years ago
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
relationships	Fix admin-facing uses of inline CSS (#13575)	4 years ago
relays	Display pending message on admin relays UI (#8494)	6 years ago
report_notes	Improve report layout (#7188)	6 years ago
reports	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
settings	Add support for setting Content Warning for CW-less outgoing toots	4 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
tags	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
warning_presets	Add titles to warning presets in admin UI (#13252)	4 years ago