mastodon-glitch/app/javascript/mastodon
Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
2024-05-01 19:30:41 +02:00
..
actions Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream 2024-05-01 16:10:45 +02:00
api_types Add API types for status and related objects (#29792) 2024-04-02 10:03:33 +00:00
components Update eslint (non-major) (#29820) 2024-04-03 18:05:39 +00:00
containers Remove global `boosts` state and convert boosts modal to Typescript (#29774) 2024-03-28 15:33:15 +00:00
features Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream 2024-05-01 19:16:48 +02:00
locales Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream 2024-05-01 19:30:41 +02:00
models Add API types for status and related objects (#29792) 2024-04-02 10:03:33 +00:00
polyfills Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
reducers Remove global `boosts` state and convert boosts modal to Typescript (#29774) 2024-03-28 15:33:15 +00:00
selectors Rewrite PIP state in Typescript (#27645) 2024-03-27 15:19:33 +00:00
service_worker
store Fix Redux Middleware types (#29800) 2024-04-02 09:56:03 +00:00
utils Add tests for our number formatting function (#29852) 2024-04-05 08:06:31 +00:00
api.ts Rewrite markers reducer in Typescript (#27644) 2024-03-27 12:47:09 +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
initial_state.js Remove setting for unfollow confirmation modal, and make it unconditional (#29373) 2024-03-22 16:24:04 +00:00
is_mobile.ts
load_keyboard_extensions.js
main.jsx Use helpers to check environment in frontend (#27633) 2023-10-31 16:05:44 +00:00
performance.js Use helpers to check environment in frontend (#27633) 2023-10-31 16:05:44 +00:00
permissions.ts
ready.js
scroll.ts
settings.js Add volume saving/reuse to video player (#27488) 2023-11-07 18:15:38 +00:00
stream.js
test_helpers.tsx Update devDependencies (non-major) (#29089) 2024-02-27 16:07:43 +00:00
test_setup.js
uuid.ts Update eslint (non-major) (#29820) 2024-04-03 18:05:39 +00:00