Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16:25 +01:00
..
account	Don't allow URLs that contain non-normalized paths to be verified (#20999)	2022-11-20 19:28:13 +01:00
account_suggestions	…
admin	…
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
form	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
trends	…
web	…
account.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
account_alias.rb	…
account_conversation.rb	…
account_deletion_request.rb	…
account_domain_block.rb	…
account_filter.rb	Add "disabled" user filter for admin/accounts UI (#21282)	2022-12-15 17:30:47 +01:00
account_migration.rb	Fix 500 error when trying to migrate to an invalid address (#21462)	2022-12-07 02:35:39 +01:00
account_moderation_note.rb	…
account_note.rb	…
account_pin.rb	…
account_stat.rb	…
account_statuses_cleanup_policy.rb	…
account_statuses_filter.rb	…
account_suggestions.rb	…
account_summary.rb	…
account_warning.rb	…
account_warning_preset.rb	…
admin.rb	…
announcement.rb	…
announcement_filter.rb	…
announcement_mute.rb	…
announcement_reaction.rb	…
appeal.rb	…
application_record.rb	…
backup.rb	…
block.rb	…
bookmark.rb	…
canonical_email_block.rb	…
content_retention_policy.rb	…
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_category.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	Fix irreversible and whole_word parameters handling in /api/v1/filters (#21988)	2022-12-07 00:10:53 +01:00
custom_filter_keyword.rb	…
custom_filter_status.rb	…
device.rb	…
direct_feed.rb	…
domain_allow.rb	…
domain_block.rb	…
email_domain_block.rb	…
encrypted_message.rb	…
export.rb	…
extended_description.rb	…
favourite.rb	…
featured_tag.rb	…
feed.rb	…
follow.rb	…
follow_recommendation.rb	…
follow_recommendation_filter.rb	…
follow_recommendation_suppression.rb	…
follow_request.rb	…
home_feed.rb	…
identity.rb	…
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	…
invite_filter.rb	…
ip_block.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
login_activity.rb	…
marker.rb	…
media_attachment.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
mention.rb	…
message_franking.rb	…
mute.rb	…
notification.rb	…
one_time_key.rb	…
poll.rb	Clear voter count when poll is reset (#21700)	2022-11-26 23:08:25 +01:00
poll_vote.rb	…
preview_card.rb	…
preview_card_provider.rb	…
preview_card_trend.rb	…
privacy_policy.rb	…
public_feed.rb	…
relationship_filter.rb	…
relay.rb	Strip spaces around URL when adding a relay (#22655)	2023-01-05 13:33:33 +01:00
remote_follow.rb	…
report.rb	…
report_filter.rb	…
report_note.rb	…
rule.rb	…
scheduled_status.rb	…
search.rb	…
session_activation.rb	…
setting.rb	…
site_upload.rb	…
status.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-28 11:33:34 +01:00
status_edit.rb	…
status_pin.rb	…
status_stat.rb	…
status_trend.rb	…
system_key.rb	…
tag.rb	Fix ・ detection in hashtag regex to construct hashtag correctly (#22888)	2023-01-04 02:12:48 +01:00
tag_feed.rb	…
tag_follow.rb	…
tombstone.rb	…
trends.rb	…
unavailable_domain.rb	…
user.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
user_invite_request.rb	…
user_ip.rb	…
user_role.rb	…
web.rb	…
webauthn_credential.rb	…
webhook.rb	Add webhook `account.approved` (#22938)	2023-01-05 13:29:49 +01:00