You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		4 years ago
..
actions	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
components	Fix: also use custom private boost icon for detailed status (#14471)	4 years ago
containers	Freeze scroll position when a dropdown menu is open in the TL (#14271)	4 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
middleware	Fix 404 and 410 API errors being silently discarded in WebUI (#13279)	5 years ago
reducers	Fix block/mute pagination in WebUI (#14275)	4 years ago
selectors	Fix audio and video items in account gallery in web UI (#14282)	4 years ago
service_worker	Code style improvements in JavaScript (#13159)	5 years ago
storage	…
store	Code style improvements in JavaScript (#13159)	5 years ago
utils	Replace shortNumberFormat with <ShortNumber> (#14061)	4 years ago
api.js	…
base_polyfills.js	…
common.js	Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)	5 years ago
compare_id.js	…
extra_polyfills.js	…
initial_state.js	…
is_mobile.js	…
load_keyboard_extensions.js	…
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	Better manage subscriptionCounters (#14608)	4 years ago
test_setup.js	Replace to testing-library from enzyme (#14152)	4 years ago
uuid.js	…