Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
actions	Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +01:00
api_types	Add profile setup to onboarding in web UI (#27829)	2023-11-15 11:13:53 +00:00
components	Fix report reason selector in moderation interface not unselecting rules when changing category (#29026)	2024-02-06 09:35:36 +00:00
containers	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
features	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
locales	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
models	Add profile setup to onboarding in web UI (#27829)	2023-11-15 11:13:53 +00:00
polyfills	Improve Babel configuration and automatically load polyfills (#27333)	2023-10-31 10:55:13 +00:00
reducers	Fix sensitive flag not being removed when removing CW in new compose form (#29248)	2024-02-19 13:31:16 +00:00
selectors	Upgrade Redux packages (#28585)	2024-01-08 10:57:40 +00:00
service_worker	Upgrade react-intl (#24906)	2023-05-31 23:43:39 +02:00
store	Update dependency react-redux to v9.1.0 (#28717)	2024-01-19 09:41:03 +00:00
utils	Converted app/javascript/mastodon/utils/ folder to TypeScript (#27895)	2023-11-28 17:47:55 +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