Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well.		2024-10-26 13:38:07 +02:00
..
actions	Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream	2024-10-19 19:13:32 +02:00
api	Add notification grouping for follow notifications (#32085)	2024-09-25 13:36:19 +00:00
api_types	Fix mute duration not being shown in list of muted accounts in web UI (#32388)	2024-10-10 14:53:12 +00:00
components	Redesign Content Warning and filters (#32543)	2024-10-23 09:47:23 +00:00
containers	Change design of embed modal in web UI (#31801)	2024-09-12 12:54:16 +00:00
features	Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream	2024-10-26 13:38:07 +02:00
locales	Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream	2024-10-26 13:38:07 +02:00
models	Fix mute duration not being shown in list of muted accounts in web UI (#32388)	2024-10-10 14:53:12 +00:00
polyfills	Improve Babel configuration and automatically load polyfills (#27333)	2023-10-31 10:55:13 +00:00
reducers	Do not change follow counters when already following (#32622)	2024-10-22 12:49:10 +00:00
selectors	Add ability to group follow notifications in WebUI (#32520)	2024-10-16 08:33:11 +00:00
service_worker	Fix notification push notifications not including the author's username (#32254)	2024-10-04 14:29:23 +00:00
store	Convert notification requests actions and reducers to Typescript (#31866)	2024-09-16 09:54:03 +00:00
utils	Fix too many requests caused by relationship look-ups in web UI (#32042)	2024-09-24 17:02:36 +00:00
api.ts	Add preview of followers removed in domain block modal in web UI (#32032)	2024-09-25 18:13:36 +00:00
blurhash.ts	Upgrade to typescript-eslint v6 (#25904)	2023-07-13 11:49:16 +02:00
common.js	Update typescript-eslint monorepo to v8 (major) (#31231)	2024-09-11 13:59:46 +00:00
compare_id.ts	Use Prettier for ESLint formatting TypeScript (#23631)	2023-05-09 19:02:12 +02:00
identity_context.tsx	Remove the access token from Redux & context (#30275)	2024-05-22 14:45:18 +00:00
initial_state.js	Enable grouped notifications unconditionally (#31929)	2024-09-16 13:12:10 +00: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	Add quick links to Administration and Moderation Reports from Web UI (#24838)	2024-08-26 16:42:46 +00:00
ready.js	Disable push notification when not logged in (#19272)	2022-10-03 18:15:47 +02:00
scroll.ts	Fix browser glitch caused by two overlapping scroll animations in web UI (#31960)	2024-09-19 10:52:46 +00:00
settings.js	Update typescript-eslint monorepo to v8 (major) (#31231)	2024-09-11 13:59:46 +00:00
stream.js	Remove unused E2EE-related methods (#31964)	2024-09-19 10:23:58 +00:00
test_helpers.tsx	Fix browser glitch caused by two overlapping scroll animations in web UI (#31960)	2024-09-19 10:52:46 +00:00
test_setup.js	Update dependency @testing-library/jest-dom to v6 (#26479)	2023-08-28 12:19:42 +02:00
uuid.ts	Update eslint (non-major) (#29820)	2024-04-03 18:05:39 +00:00