Glitch-Shrike/app/javascript/mastodon
Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
2024-06-17 18:30:28 +02:00
..
actions Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
api Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
api_types Add API types for status and related objects (#29792) 2024-04-02 10:03:33 +00:00
components Change sidebar text in web UI (#30696) 2024-06-14 13:04:20 +00:00
containers Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
features Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 2024-06-17 18:30:28 +02:00
locales Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 2024-06-17 18:30:28 +02:00
models Add API types for status and related objects (#29792) 2024-04-02 10:03:33 +00:00
polyfills
reducers Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
selectors
service_worker
store Enable stricter Typescript options (#30435) 2024-05-27 09:24:59 +00:00
utils Add tests for our number formatting function (#29852) 2024-04-05 08:06:31 +00:00
api.ts Fix `createDataLoadingThunk` and related actions (#30408) 2024-05-23 18:22:42 +00:00
blurhash.ts
common.js Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`) (#29869) 2024-04-08 08:17:51 +00:00
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 Update eslint (non-major) (#29820) 2024-04-03 18:05:39 +00:00