Claire 1474318691 Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main ... Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road.		2023-12-17 15:32:29 +01:00
..
actions	Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream	2023-10-09 21:12:28 +02:00
api_types	Add Typescript types for some API objects (#26602)	2023-09-26 11:25:01 +02:00
components	Simplify column headers (#27557)	2023-10-27 13:21:07 +00:00
containers	Convert `dropdown_menu` state to Typescript (#25585)	2023-09-22 18:18:46 +02:00
features	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
locales	Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main	2023-12-17 15:32:29 +01:00
polyfills	Upgrade to `typescript-eslint` v6 (#25904)	2023-07-13 11:49:16 +02:00
reducers	Convert `dropdown_menu` state to Typescript (#25585)	2023-09-22 18:18:46 +02:00
selectors	Add toast with option to open post after publishing in web UI (#25564)	2023-07-08 20:01:08 +02:00
service_worker	…
store	Fix Redux types (#26899)	2023-09-12 12:18:19 +02:00
utils	Fix incorrect proptypes from react-router-v5 update (#27507)	2023-10-23 11:39:53 +02: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	…
compare_id.ts	…
initial_state.js	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02: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	Fix notification permissions being requested immediately after login (#26472)	2023-09-12 18:27:01 +02:00
performance.js	…
permissions.ts	…
ready.js	…
scroll.ts	Upgrade to `typescript-eslint` v6 (#25904)	2023-07-13 11:49:16 +02:00
settings.js	Add recent searches in web UI (#26834)	2023-09-07 14:56:19 +02: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	Upgrade to `typescript-eslint` v6 (#25904)	2023-07-13 11:49:16 +02:00