chuckya/app/javascript/mastodon
Claire bc33be0342 Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
  Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
..
actions Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 2023-12-17 23:04:16 +01:00
api_types Use Immutable Record for accounts in Redux state (#26559) 2023-11-03 15:00:03 +00:00
components Change alt text to empty string for avatars (#21875) 2023-11-07 21:46:08 +00:00
containers Use helpers to check environment in frontend (#27633) 2023-10-31 16:05:44 +00:00
features Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream 2023-12-18 18:07:24 +01:00
locales Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream 2023-12-17 23:04:16 +01:00
models Use Immutable Record for accounts in Redux state (#26559) 2023-11-03 15:00:03 +00:00
polyfills Improve Babel configuration and automatically load polyfills (#27333) 2023-10-31 10:55:13 +00:00
reducers Feature - Prevents multiple audio/video attachments from being played at the same time (#24717) 2023-11-07 23:37:58 +00:00
selectors Use Immutable Record for accounts in Redux state (#26559) 2023-11-03 15:00:03 +00:00
service_worker Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
store Use Immutable Record for accounts in Redux state (#26559) 2023-11-03 15:00:03 +00:00
utils Use helpers to check environment in frontend (#27633) 2023-10-31 16:05:44 +00:00
api.ts Convert actions/account_notes into Typescript (#26601) 2023-09-11 16:09:22 +02:00
blurhash.ts Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
common.js Dont use CommonJS (require, module.exports) anywhere (#24913) 2023-05-09 03:08:47 +02:00
compare_id.ts Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
initial_state.js Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main 2023-12-17 17:43:30 +01:00
is_mobile.ts Change links in multi-column mode so tabs are open in single-column mode (#25893) 2023-07-13 17:18:09 +02:00
load_keyboard_extensions.js fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
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 Use Prettier for ESLint formatting TypeScript (#23631) 2023-05-09 19:02:12 +02:00
ready.js Disable push notification when not logged in (#19272) 2022-10-03 18:15:47 +02:00
scroll.ts Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00
settings.js Add volume saving/reuse to video player (#27488) 2023-11-07 18:15:38 +00:00
stream.js Add eslint-plugin-jsdoc (#24719) 2023-04-30 02:29:54 +02:00
test_helpers.tsx Simplify column headers (#27557) 2023-10-27 13:21:07 +00:00
test_setup.js Update dependency @testing-library/jest-dom to v6 (#26479) 2023-08-28 12:19:42 +02:00
uuid.ts Upgrade to typescript-eslint v6 (#25904) 2023-07-13 11:49:16 +02:00