Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
about	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
account	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
account_gallery	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
account_timeline	Change alt text to empty string for avatars (#21875)	2023-11-07 21:46:08 +00:00
audio	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
blocks	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
bookmarked_statuses	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
closed_registrations_modal	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
community_timeline	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
compose	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
direct_timeline	Refactor conversations components in web UI (#28833)	2024-01-25 14:34:26 +00:00
directory	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
domain_blocks	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
emoji	Add a version comment to the emoji preval-ed file so it is regenerated (#28700)	2024-01-12 03:39:11 +00:00
explore	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
favourited_statuses	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
favourites	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
filters	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
firehose	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
follow_requests	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
followed_tags	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
followers	Fix Web UI not displaying appropriate explanation when a user hides their follows/followers (#27791)	2023-11-09 12:58:02 +00:00
following	Fix Web UI not displaying appropriate explanation when a user hides their follows/followers (#27791)	2023-11-09 12:58:02 +00:00
getting_started	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
hashtag_timeline	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
home_timeline	Change follow suggestions design in web UI (#29272)	2024-02-19 11:09:58 +00:00
interaction_modal	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
keyboard_shortcuts	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
list_adder	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
list_editor	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
list_timeline	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
lists	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
mutes	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
notifications	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
onboarding	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
picture_in_picture	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
pinned_statuses	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
privacy_policy	Enforce import order with ESLint (#25096)	2023-05-23 17:15:17 +02:00
public_timeline	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
reblogs	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
report	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
standalone/compose	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
status	Use active variants for boost icons and increase icon size (#27924)	2024-01-24 12:37:43 +00:00
subscribed_languages_modal	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
ui	Fix 'focus the compose textarea' shortcut is not working (#29059)	2024-02-02 06:33:53 +00:00
video	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00