Claire 1d1c3a808a Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream ... Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed.		2024-04-06 21:01:40 +02:00
..
actions	Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream	2024-03-15 22:48:04 +01:00
api_types	Add profile setup to onboarding in web UI (#27829)	2023-11-15 11:13:53 +00:00
components	Add the role ID to the badge component (#29707)	2024-03-22 11:59:35 +00:00
containers	Remove setting for unfollow confirmation modal, and make it unconditional (#29373)	2024-03-22 16:24:04 +00:00
features	Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream	2024-04-06 21:01:40 +02:00
locales	Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream	2024-04-06 21:01:40 +02: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	Add notifications of severed relationships (#27511)	2024-03-20 15:37:21 +00:00
selectors	Upgrade Redux packages (#28585)	2024-01-08 10:57:40 +00:00
service_worker	…
store	Update dependency react-redux to v9.1.0 (#28717)	2024-01-19 09:41:03 +00:00
utils	Use vanilla JS to get Rails CSRF values (#29403)	2024-03-12 17:10:37 +00:00
api.ts	…
blurhash.ts	…
common.js	…
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	…