mastodon-glitch/app/javascript/mastodon
Claire e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
2024-08-02 18:09:48 +02:00
..
actions Merge commit 'a50c8e951f03a8eb53957ad1c3703155b223ed24' into glitch-soc/merge-upstream 2024-07-31 18:16:01 +02:00
api Change grouped notifications API shape (take 2) (#31214) 2024-07-31 10:50:13 +00:00
api_types Fix issue with grouped notifications UI due to recent API change (#31224) 2024-07-31 13:23:08 +00:00
components Change the filtered notification count to be in the account avatar (#31262) 2024-08-02 13:18:19 +00:00
containers Change design of confirmation modals in web UI (#30884) 2024-07-25 17:05:54 +00:00
features Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 2024-08-02 18:09:48 +02:00
locales Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 2024-08-02 18:09:48 +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 Further de-emphasize filtered notifications banner and add setting to minimize it (#31250) 2024-08-02 14:59:37 +00:00
selectors Further de-emphasize filtered notifications banner and add setting to minimize it (#31250) 2024-08-02 14:59:37 +00:00
service_worker
store Improve `createdataLoadingThunk` (#30778) 2024-06-20 11:42:10 +00:00
utils Add tests for our number formatting function (#29852) 2024-04-05 08:06:31 +00:00
api.ts Change `apiRequest` to accept both `params` and `data` (#30818) 2024-06-25 13:45:41 +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 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 Update eslint (non-major) (#29820) 2024-04-03 18:05:39 +00:00