You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
nyastodon/app/javascript/mastodon
Claire 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Our config file is pretty different from upstream.
  Upstream changed CSP directive `script-src` to include
  `wasm-unsafe-eval` instead of `unsafe-eval`, which we
  did not include.
  Added `wasm-unsafe-eval` to `script-src` to fix
  execution of the OCR web worker.
- `package.json`:
  Upstream updated a dependency (`array-includes`) textually
  adjacent to a glitch-soc-only dependency (`atrament`).
  Updated `array-includes` as upstream did.
2 years ago
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
components Fix wrong color on mentions hidden behind content warning in web UI (#20724) 2 years ago
containers Remove unused timeline_container to fix linter errors (#20305) 2 years ago
features Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
locales Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
middleware
reducers Fix media metadata being only editable once (#20665) 2 years ago
selectors Change public accounts pages to mount the web UI (#19319) 2 years ago
service_worker Disable media cache on service worker (#19471) 2 years ago
store
utils Fix WebUI error in development mode (#19078) 2 years ago
api.js Replace `CancelToken` to `AbortSignal` (#19352) 2 years ago
base_polyfills.js
blurhash.js
common.js
compare_id.js
extra_polyfills.js Replace `CancelToken` to `AbortSignal` (#19352) 2 years ago
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2 years ago
is_mobile.js Hide list panel from nav bar in mobile layout (#19337) 2 years ago
load_keyboard_extensions.js
load_polyfills.js Replace `CancelToken` to `AbortSignal` (#19352) 2 years ago
main.js Delay workbox import (#20376) 2 years ago
performance.js
permissions.js Add customizable user roles (#18641) 2 years ago
ready.js Disable push notification when not logged in (#19272) 2 years ago
scroll.js
settings.js Add dismissable hints to various timelines in web UI (#19315) 2 years ago
stream.js
test_setup.js
uuid.js