Glitch-Shrike/app/javascript/mastodon
Claire 83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
..
actions Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 2024-08-12 17:46:24 +02:00
api Fix extra slash on notification policy request (#31378) 2024-08-11 21:28:43 +00:00
api_types Fix all streamed notification types being stored without filtering (#31384) 2024-08-12 13:40:29 +00:00
components Add ability to report, block and mute from notification requests list (#31309) 2024-08-09 14:56:39 +00:00
containers
features Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream 2024-08-11 21:05:09 +02:00
locales Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 2024-08-12 17:46:24 +02:00
models Fix issue with grouped notifications UI due to recent API change (#31224) 2024-07-31 13:23:08 +00:00
polyfills
reducers Fix all streamed notification types being stored without filtering (#31384) 2024-08-12 13:40:29 +00:00
selectors Change unread notification count to only cover the selected notification type (#31326) 2024-08-08 20:20:52 +00:00
service_worker
store Remove usage of non-public RTK types (#31312) 2024-08-06 12:22:18 +00:00
utils
api.ts
blurhash.ts
common.js
compare_id.ts
identity_context.tsx
initial_state.js
is_mobile.ts
load_keyboard_extensions.js
main.jsx
performance.js
permissions.ts
ready.js
scroll.ts
settings.js
stream.js
test_helpers.tsx
test_setup.js
uuid.ts