Claire 0f90e624c5 Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict due to our theming system being different.
  Ported upstream's changes.

2024-05-01 16:10:45 +02:00

..

importer

Use Immutable Record for accounts in Redux state (#26559)

2023-11-03 15:00:03 +00:00

push_notifications

…

account_notes.ts

Use Immutable Record for accounts in Redux state (#26559)

2023-11-03 15:00:03 +00:00

accounts_typed.ts

Fix the loading bar with the new Redux actions (#28422)

2023-12-18 23:19:27 +00:00

accounts.js

Add profile setup to onboarding in web UI (#27829)

2023-11-15 11:13:53 +00:00

alerts.js

Change eslint config to autofix missing comma and indentation in JS files (#26711)

2023-10-09 13:38:29 +02:00

announcements.js

…

app.ts

…

blocks.js

Change mute, block and domain block confirmations in web UI (#29576)

2024-03-15 17:36:41 +00:00

bookmarks.js

…

bundles.js

…

columns.js

…

compose.js

Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream

2024-04-06 21:48:35 +02:00

conversations.js

…

custom_emojis.js

…

directory.js

…

domain_blocks_typed.ts

Fix the loading bar with the new Redux actions (#28422)

2023-12-18 23:19:27 +00:00

domain_blocks.js

Change mute, block and domain block confirmations in web UI (#29576)

2024-03-15 17:36:41 +00:00

dropdown_menu.ts

…

emojis.js

…

favourites.js

…

featured_tags.js

…

filters.js

…

height_cache.js

…

history.js

…

interactions.js

…

languages.js

…

lists.js

…

markers.ts

Fix notifications marker fetch (#29777)

2024-03-27 15:49:02 +00:00

modal.ts

…

mutes.js

Change mute, block and domain block confirmations in web UI (#29576)

2024-03-15 17:36:41 +00:00

notifications_typed.ts

Fix notification sounds (#28316)

2023-12-11 14:23:30 +00:00

notifications.js

Fix accounts not getting imported into redux store for some filtered notification types (#29588)

2024-03-14 09:34:36 +00:00

onboarding.js

…

picture_in_picture.ts

Rewrite PIP state in Typescript (#27645)

2024-03-27 15:19:33 +00:00

pin_statuses.js

…

polls.js

…

reports.js

…

search.js

Fix duplicate and missing keys in search popout component in web UI (#28834)

2024-01-21 07:44:46 +00:00

server.js

…

settings.js

…

statuses.js

…

store.js

Use Immutable Record for accounts in Redux state (#26559)

2023-11-03 15:00:03 +00:00

streaming.js

…

suggestions.js

Change onboarding prompt to follow suggestions carousel in web UI (#28878)

2024-02-01 13:37:04 +00:00

tags.js

…

timelines.js

Change onboarding prompt to follow suggestions carousel in web UI (#28878)

2024-02-01 13:37:04 +00:00

trends.js

…