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 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		5 years ago
..
actions	FIX: filters ignore media descriptions (#13837)	5 years ago
components	Hide sensitive preview cards with blurhash (#13985)	5 years ago
containers	Fix expanded video player issues (#13541)	5 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
middleware	Fix 404 and 410 API errors being silently discarded in WebUI (#13279)	5 years ago
reducers	Fix timeline markers not working on Chrome (#13887)	5 years ago
selectors	Code style improvements in JavaScript (#13159)	5 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	Fix uninformative error message when uploading unsupported image files (#13540)	5 years ago
api.js	…
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	…
extra_polyfills.js	fix multiple space (#12655)	5 years ago
initial_state.js	…
is_mobile.js	…
load_keyboard_extensions.js	…
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	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	minor server-sent events fixes (#12945)	5 years ago
test_setup.js	…
uuid.js	…