mastodon-glitch/app/javascript/mastodon
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +01:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
components Make larger part of status clickable (#23621) 2023-02-20 08:11:23 +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-02-25 14:00:40 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
middleware Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
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 Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
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 Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
compare_id.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
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-02-09 12:46:12 +01:00
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js Remove object-fit polyfill for the old Microsoft Edge (#22693) 2023-01-05 13:32:02 +01:00
main.jsx Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
performance.js
permissions.js Add dropdown menu item to open admin interface for remote domains (#21895) 2023-01-05 14:03:46 +01:00
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00