Glitch-Shrike/app/javascript/mastodon
Claire 18556d3e9b Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream refactored some helpers and moved them in another file.
  Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
  Kept glitch-soc definitions where they are and moved upstream ones
  as upstream did.
2024-08-22 19:54:20 +02:00
..
actions Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream 2024-08-21 18:44:21 +02:00
api Add automatic notification polling for grouped notifications (#31513) 2024-08-21 14:41:31 +00:00
api_types Fix notification screen crashing in rare cases where the status no longer exists (#31403) 2024-08-14 06:47:15 +00:00
components Change hints for missing remote content in web UI (#31516) 2024-08-21 07:08:58 +00:00
containers Change design of confirmation modals in web UI (#30884) 2024-07-25 17:05:54 +00:00
features Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream 2024-08-22 19:54:20 +02:00
locales Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream 2024-08-22 19:54:20 +02:00
models Fix notification screen crashing in rare cases where the status no longer exists (#31403) 2024-08-14 06:47:15 +00:00
polyfills
reducers Add automatic notification polling for grouped notifications (#31513) 2024-08-21 14:41:31 +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 Fix log out from user menu not working on Safari (#31402) 2024-08-13 17:49:23 +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 Remove `font-awesome` npm package (#31512) 2024-08-20 15:59:47 +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