1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-13 06:09:08 +09:00
YuruToot/app/javascript/mastodon/actions
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
..
importer Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
push_notifications Enable ESLint no-useless-escape (#23311) 2023-02-13 15:12:14 +01:00
account_notes.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
accounts.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
alerts.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
announcements.js Fix being unable to react with the keycap number sign emoji (#22231) 2022-12-15 16:18:39 +01:00
app.js Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
blocks.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
bookmarks.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
boosts.js Fix eslint error (#16212) 2021-05-11 14:17:38 +02:00
bundles.js Lazy load components (#3879) 2017-07-08 00:06:02 +02:00
columns.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
compose.js Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
conversations.js Change conversations UI (#11896) 2019-09-21 20:01:16 +02:00
custom_emojis.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
directory.js Add profile directory to web UI (#11688) 2019-08-30 00:14:36 +02:00
domain_blocks.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
dropdown_menu.js Fix dropdown menu positions when scrolling (#22916) 2023-01-11 21:58:46 +01:00
emojis.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
favourites.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
featured_tags.js Add featured tags selector for WebUI (#19358) 2022-10-16 08:43:59 +02:00
filters.js Move V2 Filter methods under /api/v2 prefix (#20622) 2022-11-14 08:34:07 +01:00
height_cache.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
history.js Add edit history to web UI (#17390) 2022-02-09 01:17:07 +01:00
interactions.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
languages.js Add language dropdown to compose in web UI (#18420) 2022-05-16 11:18:35 +02:00
lists.js Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
markers.js SUBMIT doesn't exist on XMLHttpRequest (#24423) 2023-04-05 10:56:55 +02:00
modal.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
mutes.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
notifications.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
onboarding.js Change onboarding by replacing tutorial with follow recommendations in web UI (#16060) 2021-04-19 14:45:15 +02:00
picture_in_picture.js [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
pin_statuses.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
polls.js Fix poll options not rendering text after vote/refresh (#10189) 2019-03-06 05:35:52 +01:00
reports.js Fix reporting from profile (#17632) 2022-02-23 21:37:02 +01:00
search.js Change hashtags and mentions in bios to open in-app in web UI (#24643) 2023-04-25 06:33:21 +02:00
server.js Replace Status#translatable? with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
settings.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
statuses.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
store.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
streaming.js [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
suggestions.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
tags.js Separate ESLint CI from Superlinter (#23029) 2023-01-29 23:44:03 +01:00
timelines.js Enable eslint:recommended ruleset (#22433) 2022-12-19 00:51:37 +09:00
trends.js Add pagination for trending statuses in web UI (#17976) 2022-04-06 22:53:29 +02:00