Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16:25 +01:00
..
actions	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-21 15:59:39 +01:00
components	Add dropdown menu item to open admin interface for remote domains (#21895)	2023-01-05 14:03:46 +01:00
containers	Fix wasteful request to /api/v1/custom_emojis when not logged in (#22326)	2022-12-15 14:07:34 +01:00
features	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
middleware	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
reducers	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
selectors	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
service_worker	Disable media cache on service worker (#19471)	2022-10-26 18:21:36 +02:00
store	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
utils	Fix WebUI error in development mode (#19078)	2022-08-29 10:02:40 +02:00
api.js	Replace `CancelToken` to `AbortSignal` (#19352)	2022-10-14 03:16:37 +02:00
base_polyfills.js	…
blurhash.js	…
common.js	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
compare_id.js	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
extra_polyfills.js	Remove object-fit polyfill for the old Microsoft Edge (#22693)	2023-01-05 13:32:02 +01:00
initial_state.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
is_mobile.js	Hide list panel from nav bar in mobile layout (#19337)	2022-10-10 21:41:25 +02:00
load_keyboard_extensions.js	…
load_polyfills.js	Remove object-fit polyfill for the old Microsoft Edge (#22693)	2023-01-05 13:32:02 +01:00
main.js	Delay workbox import (#20376)	2022-11-11 01:33:59 +01:00
performance.js	…
permissions.js	Add dropdown menu item to open admin interface for remote domains (#21895)	2023-01-05 14:03:46 +01:00
ready.js	Disable push notification when not logged in (#19272)	2022-10-03 18:15:47 +02:00
scroll.js	…
settings.js	Add dismissable hints to various timelines in web UI (#19315)	2022-10-09 06:08:37 +02:00
stream.js	…
test_setup.js	…
uuid.js	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00