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 ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		4 years ago
..
actions	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
components	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago
containers	Add pop-out player for audio/video in web UI (#14870)	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	Change how missing desktop notifications permission is displayed (#14985)	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	…
utils	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	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	Merge branch 'master' into glitch-soc/merge-upstream	4 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	…
main.js	Fix browser notification permission request logic (#13543)	4 years ago
performance.js	Restore vanilla components	7 years ago
ready.js	…
rtl.js	…
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	…