Claire 449dc30739 Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream ...

Conflicts:
- `app/lib/content_security_policy.rb`:
  Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
  glitch-soc's `EXTRA_DATA_HOST`.
  Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.

2025-03-26 19:14:26 +01:00

..

actions

Merge commit '94d71c992e0fd88fc3a3fc92b598f139c874ab3f' into glitch-soc/merge-upstream

2025-03-25 21:12:37 +01:00

api

Add effective date to terms of service (#33993)

2025-03-05 09:01:33 +00:00

api_types

Add effective date to terms of service (#33993)

2025-03-05 09:01:33 +00:00

components

Add new filter action to blur media (#34256)

2025-03-26 07:31:05 +00:00

containers

Fix /share not using server-set characters limit (#33459)

2025-01-06 08:14:11 +00:00

features

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

2025-03-26 18:18:07 +01:00

hooks

Move app/javascript/hooks to app/javascript/mastodon/hooks (#34077)

2025-03-05 16:55:53 +00:00

locales

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

2025-03-26 19:14:26 +01:00

models

Refactor alerts to TypeScript, remove react-notification dependency (#34239)

2025-03-25 18:25:07 +00:00

polyfills

…

reducers

Refactor alerts to TypeScript, remove react-notification dependency (#34239)

2025-03-25 18:25:07 +00:00

selectors

Add new filter action to blur media (#34256)

2025-03-26 07:31:05 +00:00

service_worker

Fix notification push notifications not including the author's username (#32254)

2024-10-04 14:29:23 +00:00

store

Refactor alerts to TypeScript, remove react-notification dependency (#34239)

2025-03-25 18:25:07 +00:00

utils

Fix bookmarks and favourites not being filtered (#34260)

2025-03-25 15:20:36 +00:00

api.ts

Add Deprecation headers on deprecated endpoints (#34262)

2025-03-25 12:30:10 +00:00

blurhash.ts

…

common.js

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

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

compare_id.ts

…

identity_context.tsx

…

initial_state.js

Add reminder when about to post without alt text in web UI (#33760)

2025-01-29 11:37:56 +00:00

is_mobile.ts

…

load_keyboard_extensions.js

…

main.jsx

…

performance.js

…

permissions.ts

Add link from Web UI for Hashtags to the Moderation UI (#31448)

2024-11-29 07:36:17 +00:00

ready.js

…

scroll.ts

Fix browser glitch caused by two overlapping scroll animations in web UI (#31960)

2024-09-19 10:52:46 +00:00

settings.js

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

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

stream.js

Remove unused E2EE-related methods (#31964)

2024-09-19 10:23:58 +00:00

test_helpers.tsx

Fix browser glitch caused by two overlapping scroll animations in web UI (#31960)

2024-09-19 10:52:46 +00:00

test_setup.js

…

uuid.ts

…