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 7a84a84fc1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		4 years ago
..
account_actions	Add titles to warning presets in admin UI (#13252)	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	Fix method of the DELETE DATA button (#14855)	4 years ago
action_logs	Fix admin audit log crash due to glitch-soc theming changes	5 years ago
announcements	Fix design of announcements in admin UI (#12989)	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	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)	5 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)	6 years ago
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
relationships	Fix admin-facing uses of inline CSS (#13575)	5 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	4 years ago
settings	Add support for setting Content Warning for CW-less outgoing toots	5 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	5 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)	5 years ago