Claire 077e0c6812 Merge commit '0b4a3a0437' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
actions	Merge commit 'bd575a1dd6' into glitch-soc/merge-upstream	2023-12-19 20:17:23 +01:00
api_types	Add profile setup to onboarding in web UI (#27829)	2023-11-15 11:13:53 +00:00
components	Change dismissed banners to be stored server-side (#27055)	2023-11-30 11:45:54 +00:00
containers	Use helpers to check environment in frontend (#27633)	2023-10-31 16:05:44 +00:00
features	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
locales	Merge commit '0b4a3a0437' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +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	Change dismissed banners to be stored server-side (#27055)	2023-11-30 11:45:54 +00:00
selectors	Use Immutable Record for accounts in Redux state (#26559)	2023-11-03 15:00:03 +00:00
service_worker
store	Use Immutable Record for accounts in Redux state (#26559)	2023-11-03 15:00: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
common.js
compare_id.ts
initial_state.js	Merge commit '3bf896c973' into glitch-soc/main	2023-12-17 17:43:30 +01: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	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