mastodon/app/javascript/mastodon
Claire 2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
2024-07-22 17:38:30 +02:00
..
actions Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
api Grouped Notifications UI (#30440) 2024-07-18 14:36:09 +00:00
api_types Grouped Notifications UI (#30440) 2024-07-18 14:36:09 +00:00
components Remove routerHistory parameters from composer actions (#31077) 2024-07-19 15:26:44 +00:00
containers Remove routerHistory parameters from composer actions (#31077) 2024-07-19 15:26:44 +00:00
features Merge commit '0397df9bef82042221f35e9938ad5b917fa1d4fc' into glitch-soc/merge-upstream 2024-07-19 17:45:19 +02:00
locales Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream 2024-07-22 17:38:30 +02:00
models Grouped Notifications UI (#30440) 2024-07-18 14:36:09 +00:00
polyfills
reducers Grouped Notifications UI (#30440) 2024-07-18 14:36:09 +00:00
selectors Grouped Notifications UI (#30440) 2024-07-18 14:36:09 +00:00
service_worker
store Improve `createdataLoadingThunk` (#30778) 2024-06-20 11:42:10 +00:00
utils
api.ts Change `apiRequest` to accept both `params` and `data` (#30818) 2024-06-25 13:45:41 +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 Add setting to disable hover cards (#30931) 2024-07-11 19:42:58 +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 chore(deps): update dependency @testing-library/react to v16 (#30533) 2024-06-28 11:39:32 +00:00
test_setup.js
uuid.ts