Glitch-Shrike/app/javascript/mastodon
Claire ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
..
actions Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 2024-02-24 14:27:43 +01:00
api_types
components Fix report reason selector in moderation interface not unselecting rules when changing category (#29026) 2024-02-06 09:35:36 +00:00
containers Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
features Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 2024-02-24 14:27:43 +01:00
locales Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 2024-02-24 14:27:43 +01:00
models
polyfills
reducers Change onboarding prompt to follow suggestions carousel in web UI (#28878) 2024-02-01 13:37:04 +00:00
selectors Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
service_worker
store Update dependency react-redux to v9.1.0 (#28717) 2024-01-19 09:41:03 +00:00
utils
api.ts
blurhash.ts
common.js
compare_id.ts
initial_state.js Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main 2023-12-17 17:43:30 +01:00
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