Glitch-Shrike/app/javascript/mastodon
Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
2023-03-05 20:46:56 +01:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
components Do not leave Mastodon when clicking “Back” (#23953) 2023-03-04 23:18:19 +01:00
containers Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
features Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2023-03-02 17:32:38 +01:00
middleware
reducers Fix case-sensitive check for previously used hashtags (#23526) 2023-02-13 14:54:08 +01:00
selectors
service_worker fix(web-push-notifications): fix favourite push notifications (#23286) 2023-02-03 09:29:32 +01:00
store
utils Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
api.js
base_polyfills.js
blurhash.js
common.js
compare_id.js
extra_polyfills.js chore: remove intersection-observer for old Safari support (#23284) 2023-01-29 19:02:04 +01:00
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2023-03-05 20:46:56 +01:00
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.jsx Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
performance.js
permissions.js
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js