Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +01:00
..
actions	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
components	Remove preview cards from fav and boost notifications (#20335)	2022-11-10 19:36:12 +01:00
containers	Remove unused timeline_container to fix linter errors (#20305)	2022-11-10 08:50:45 +01:00
features	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
middleware	…
reducers	Add the ability to edit media attachment metadata for any unattached media (#20402)	2022-11-11 21:22:17 +01: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	…
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	…
compare_id.js	…
extra_polyfills.js	Replace `CancelToken` to `AbortSignal` (#19352)	2022-10-14 03:16:37 +02: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	Replace `CancelToken` to `AbortSignal` (#19352)	2022-10-14 03:16:37 +02:00
main.js	Delay workbox import (#20376)	2022-11-11 01:33:59 +01:00
performance.js	…
permissions.js	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02: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	…