Claire f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.

The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`

2024-05-04 16:12:51 +02:00

..

about

Change background color in web UI (#29522)

2024-03-12 09:51:30 +00:00

account

Add the role ID to the badge component (#29707)

2024-03-22 11:59:35 +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

Remove setting for unfollow confirmation modal, and make it unconditional (#29373)

2024-03-22 16:24:04 +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 notification policies and notification requests in web UI (#29433)

2024-03-11 15:02:21 +00:00

compose

Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream

2024-05-04 16:12:51 +02:00

direct_timeline

Refactor conversations components in web UI (#28833)

2024-01-25 14:34:26 +00:00

directory

Remove setting for unfollow confirmation modal, and make it unconditional (#29373)

2024-03-22 16:24:04 +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

Support "system" theme setting (light/dark theme depending on user system preference) (#29748)

2024-03-26 09:25:49 +00:00

explore

Change design of people tab on explore in web UI (#30059)

2024-04-25 16:25:33 +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 notification policies and notification requests in web UI (#29433)

2024-03-11 15:02:21 +00:00

follow_requests

Change back button to always appear in advanced web UI (#29669)

2024-03-20 17:21:03 +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

Fix PropTypes for some record objects (#29786)

2024-03-28 10:05:16 +00:00

hashtag_timeline

Add notification policies and notification requests in web UI (#29433)

2024-03-11 15:02:21 +00:00

home_timeline

Add notification policies and notification requests in web UI (#29433)

2024-03-11 15:02:21 +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 / keyboard shortcut to focus the search field (#29921)

2024-04-12 09:42:12 +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 notification policies and notification requests in web UI (#29433)

2024-03-11 15:02:21 +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

Change moderation warning notification icon (#30081)

2024-04-26 15:33:15 +00:00

onboarding

Fixed rendering error on /start when not logged in (#30023)

2024-04-22 08:53:08 +00:00

picture_in_picture

Remove global boosts state and convert boosts modal to Typescript (#29774)

2024-03-28 15:33:15 +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 notification policies and notification requests in web UI (#29433)

2024-03-11 15:02:21 +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

Remove global boosts state and convert boosts modal to Typescript (#29774)

2024-03-28 15:33:15 +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

Add / keyboard shortcut to focus the search field (#29921)

2024-04-12 09:42:12 +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