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 37e746eab6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
actions	Merge branch 'master' into glitch-soc/master	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	Cache media only when storage can be freed (#7547)	6 years ago
store	Code style improvements in JavaScript (#13159)	5 years ago
utils	Replace shortNumberFormat with <ShortNumber> (#14061)	4 years ago
api.js	Do not set CSRF Token when no csrf header (#10383)	6 years ago
base_polyfills.js	Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115)	5 years ago
common.js	Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)	5 years ago
compare_id.js	Add option to disable real-time updates in web UI (#9984)	5 years ago
extra_polyfills.js	fix multiple space (#12655)	5 years ago
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
is_mobile.js	Restore vanilla components	7 years ago
load_keyboard_extensions.js	fix: support KaiOS arrow navigation on public pages (#12251)	5 years ago
load_polyfills.js	Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115)	5 years ago
main.js	Fix `/web` redirecting to `/web/web` in web UI (#13128)	5 years ago
performance.js	Restore vanilla components	7 years ago
ready.js	Restore vanilla components	7 years ago
rtl.js	Exclude URLs from text analysis (#11759)	5 years ago
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	5 years ago
settings.js	Implement tag auto-completion by history (#6621)	7 years ago
stream.js	Better manage subscriptionCounters (#14608)	4 years ago
test_setup.js	Replace to testing-library from enzyme (#14152)	4 years ago
uuid.js	Restore vanilla components	7 years ago