Claire a6147a831f Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/themes.rb` - `app/views/layouts/application.html.haml` - `app/views/layouts/embedded.html.haml` - `app/views/layouts/error.html.haml` - `config/settings.yml` All these conflicts are because glitch-soc and upstream have different theming systems and upstream changed a few things to have dynamic theme selection based on system settings. Conflicts were solved to take that into account, and `current_theme` has been changed in the process to return a tuple of `[flavour, skin]` to be used in the `theme_style_tags` helper.		2024-05-01 14:25:47 +02:00
..
actions	Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream	2024-04-06 21:48:35 +02: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 '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream	2024-05-01 14:25:47 +02:00
locales	Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream	2024-04-06 21:48:35 +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 ability to reorder uploaded media before posting in web UI (#28456)	2024-03-25 10:29:55 +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	Use vanilla JS to get Rails CSRF values (#29403)	2024-03-12 17:10:37 +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	Remove setting for unfollow confirmation modal, and make it unconditional (#29373)	2024-03-22 16:24:04 +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
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	Update devDependencies (non-major) (#29089)	2024-02-27 16:07:43 +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