catstodon/app/javascript/mastodon
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
components Change logo version in header based on screen size in web UI (#24707) 2023-04-28 10:00:33 +02:00
containers Add lines to threads in web UI (#24549) 2023-04-24 08:07:03 +02:00
features Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
middleware Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
reducers Add default post text to onboarding flow in web UI (#24705) 2023-04-28 10:05:34 +02:00
selectors Fix broken links in account gallery (#24218) 2023-03-23 05:17:29 +01:00
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 Allow == when null checking (#24593) 2023-04-19 17:46:46 +02:00
api.js [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
base_polyfills.js Remove Array.prototype.includes polyfill (#24234) 2023-04-07 13:03:42 +02:00
blurhash.js Fix not being able to open audio modal in web UI (#15283) 2020-12-07 04:29:37 +01:00
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 [Glitch] [Proposal] Make able to write React in Typescript (#2190) 2023-04-26 21:30:41 +02:00
is_mobile.js [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
load_keyboard_extensions.js fix: support KaiOS arrow navigation on public pages (#12251) 2019-11-04 13:03:09 +01:00
load_polyfills.js Remove Array.prototype.includes polyfill (#24234) 2023-04-07 13:03:42 +02:00
main.jsx Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
performance.js Move ESLint configs to overrides (#24370) 2023-04-03 12:41:10 +02:00
permissions.js Add dropdown menu item to open admin interface for remote domains (#21895) 2023-01-05 14:03:46 +01:00
ready.js Disable push notification when not logged in (#19272) 2022-10-03 18:15:47 +02:00
scroll.js Use ScrollToOptions for smooth scrolling if supported (#11207) 2019-06-29 18:32:06 +02:00
settings.js Add dismissable hints to various timelines in web UI (#19315) 2022-10-09 06:08:37 +02:00
stream.js [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
test_setup.js Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
uuid.ts New Crowdin updates (#24276) 2023-04-03 14:44:43 +02:00