mastodon/app/javascript/mastodon
Claire 51631c785f Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Glitch-soc had changes to adjacent lines.
  Ported upstream's changes.
2024-05-23 20:30:23 +02:00
..
actions Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream 2024-05-23 20:30:23 +02:00
api Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
api_types
components Fix some API calls that should not use an API token (#30401) 2024-05-23 07:30:48 +00:00
containers Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
features Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream 2024-05-23 20:30:23 +02:00
locales Merge commit '3a862439dfc989c6c5741e007c2f4e0335fffe33' into glitch-soc/merge-upstream 2024-05-23 20:11:12 +02:00
models
polyfills
reducers Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
selectors
service_worker
store Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
utils
api.ts Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
blurhash.ts
common.js
compare_id.ts
identity_context.tsx Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
initial_state.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
is_mobile.ts
load_keyboard_extensions.js
main.jsx
performance.js
permissions.ts
ready.js
scroll.ts
settings.js
stream.js Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
test_helpers.tsx Remove the access token from Redux & context (#30275) 2024-05-22 14:45:18 +00:00
test_setup.js
uuid.ts