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.

Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		4 years ago
..
actions	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
components	Change onboarding by replacing tutorial with follow recommendations in web UI (#16060)	4 years ago
containers	Change onboarding by replacing tutorial with follow recommendations in web UI (#16060)	4 years ago
features	Merge branch 'main' 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	Add cold-start follow recommendations (#15945)	4 years ago
selectors	Fix unnecessary re-rendering of various components when typing in web UI (#15286)	4 years ago
service_worker	Code style improvements in JavaScript (#13159)	5 years ago
storage	Cache media only when storage can be freed (#7547)	7 years ago
store	Code style improvements in JavaScript (#13159)	5 years ago
utils	Change max. image dimensions to 1920x1080px (1080p) (#15690)	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
blurhash.js	Fix not being able to open audio modal in web UI (#15283)	4 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	4 years ago
is_mobile.js	Fix pop-out player appearing on mobile screens in web UI (#15157)	4 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 browser notification permission request logic (#13543)	4 years ago
performance.js	Restore vanilla components	7 years ago
ready.js	Restore vanilla components	7 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	Fixed ESLint error (#15214)	4 years ago
test_setup.js	Replace to testing-library from enzyme (#14152)	4 years ago
uuid.js	Restore vanilla components	7 years ago