Claire 3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.

2024-09-12 20:05:08 +02:00

..

importer

Change author_account to be authors in REST API (#30846)

2024-06-27 13:17:18 +00:00

push_notifications

Enforce import order with ESLint (#25096)

2023-05-23 17:15:17 +02:00

account_notes.ts

Fix spurious loading bar middleware usage (#31592)

2024-08-26 16:38:34 +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

Fix keyboard shortcuts and navigation in grouped notifications (#31076)

2024-07-23 06:20:17 +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

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

app.ts

Add stricter ESLint rules for Typescript files (#24926)

2023-05-10 12:59:29 +02:00

blocks.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

bookmarks.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

bundles.js

Lazy load components (#3879)

2017-07-08 00:06:02 +02:00

columns.js

Enable eslint:recommended ruleset (#22433)

2022-12-19 00:51:37 +09:00

compose.js

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

2024-07-23 19:31:23 +02:00

conversations.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

custom_emojis.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

directory.ts

Convert <Directory> to Typescript / function component (#30829)

2024-06-26 18:04:50 +00:00

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

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

dropdown_menu.ts

Convert dropdown_menu state to Typescript (#25585)

2023-09-22 18:18:46 +02:00

emojis.js

Enable eslint:recommended ruleset (#22433)

2022-12-19 00:51:37 +09:00

favourites.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

featured_tags.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

filters.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

height_cache.js

Enable eslint:recommended ruleset (#22433)

2022-12-19 00:51:37 +09:00

history.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

interactions_typed.ts

Fix createDataLoadingThunk and related actions (#30408)

2024-05-23 18:22:42 +00:00

interactions.js

Fix boost dialog visibility selection not being taken into account (#31523)

2024-08-21 13:11:36 +00:00

lists.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

markers.ts

Update typescript-eslint monorepo to v8 (major) (#31231)

2024-09-11 13:59:46 +00:00

modal.ts

Improve modals reducer types (#26610)

2023-09-22 16:41:50 +02:00

mutes.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

notification_groups.ts

Fix all notification types being stored without filtering when polling (#31745)

2024-09-04 13:28:16 +00:00

notification_policies.ts

Decrease count of filtered notifications when notification requests are accepted or dismissed (#31149)

2024-07-26 09:36:54 +00:00

notifications_migration.tsx

Add ability for admins to force grouped notifications in web UI (#31610)

2024-08-27 14:55:51 +00:00

notifications_typed.ts

Grouped Notifications UI (#30440)

2024-07-18 14:36:09 +00:00

notifications.js

Refactor some actions to be proper async actions instead of passing a continuation (#31453)

2024-08-19 14:41:32 +00:00

onboarding.js

Change onboarding by replacing tutorial with follow recommendations in web UI (#16060)

2021-04-19 14:45:15 +02:00

picture_in_picture.ts

Rewrite PIP state in Typescript (#27645)

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

pin_statuses.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

polls.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

reports.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

search.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

server.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

settings.js

Fix Web UI trying to save user settings when logged out (#30324)

2024-05-16 13:01:01 +00:00

statuses.js

Change embedded posts to use web UI (#31766)

2024-09-12 09:41:19 +00:00

store.js

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

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

streaming.js

Update typescript-eslint monorepo to v8 (major) (#31231)

2024-09-11 13:59:46 +00:00

suggestions.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

tags.js

Remove the access token from Redux & context (#30275)

2024-05-22 14:45:18 +00:00

timelines_typed.ts

Convert disconnectTimeline and timelineDelete actions to Typescript (#30777)

2024-06-20 11:56:52 +00:00

timelines.js

Refactor some actions to be proper async actions instead of passing a continuation (#31453)

2024-08-19 14:41:32 +00:00

trends.js

Change author_account to be authors in REST API (#30846)

2024-06-27 13:17:18 +00:00