Claire 2d4b4b0b45 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit.		2022-01-17 08:28:52 +01:00
..
actions	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-16 18:11:20 +01:00
components	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
containers	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
features	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
locales	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-06 00:15:38 +01:00
middleware
reducers	ignore hashtag suggestions if they vary only in case (#16460)	2021-12-15 23:47:19 +01:00
selectors
service_worker	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
storage
store
utils	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
api.js	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00
base_polyfills.js
blurhash.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-30 00:42:52 +02:00
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js