mastodon/app/javascript/mastodon
Claire fe89554a54 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/activitypub/activity/create.rb`:
  Upstream refactored how `Create` activities are handled and how values are
  extracted from `Create`d objects. This conflicted with how glitch-soc
  supported the `directMessage` flag to explicitly distinguish between
  limited and direct messages.
  Ported glitch-soc's changes to latest upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Upstream largely refactored that file and changed some of the logic.
  This conflicted with glitch-soc's handling of the direct timeline and
  the options to allow replies and boosts in public feeds.
  Ported those glitch-soc changes on top of latest upstream changes.
- `app/services/process_mentions_service.rb`:
  Upstream refactored to move mention-related ActivityPub deliveries to
  `ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check
  to not send local-only toots to remote mentioned users.
  Took upstream's version, as the check is not needed anymore, since it is
  performed at the `ActivityPub::DeliveryWorker` call site already.
- `app/workers/feed_insert_worker.rb`:
  Upstream added support for `update` toot events, while glitch-soc had
  support for an extra timeline support, `direct`.
  Ported upstream changes and extended them to the `direct` timeline.

Additional changes:
- `app/lib/activitypub/parser/status_parser.rb`:
  Added code to handle the `directMessage` flag and take it into account
  to compute visibility.
- `app/lib/feed_manager.rb`:
  Extended upstream's support of `update` toot events to glitch-soc's
  `direct` timeline.
2022-01-19 23:52:48 +01:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2022-01-19 23:52:48 +01:00
components Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00
containers Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 20:44:59 +02:00
features Merge branch 'main' into glitch-soc/merge-upstream 2022-01-19 23:52:48 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2021-11-06 00:15:38 +01:00
middleware Fix 404 and 410 API errors being silently discarded in WebUI (#13279) 2020-03-28 17:59:45 +01:00
reducers ignore hashtag suggestions if they vary only in case (#16460) 2021-12-15 23:47:19 +01:00
selectors Fix unnecessary re-rendering of various components when typing in web UI (#15286) 2020-12-07 19:36:36 +01:00
service_worker Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
storage
store Code style improvements in JavaScript (#13159) 2020-03-08 16:02:36 +01:00
utils Add graphs and retention metrics to admin dashboard (#16829) 2021-10-14 20:44:59 +02:00
api.js Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
base_polyfills.js Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115) 2020-02-18 17:22:44 +01: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 Migrate Rails ujs as required for Rails 6 Upgrade. (#13280) 2020-03-21 03:14:50 +01:00
compare_id.js
extra_polyfills.js fix multiple space (#12655) 2019-12-19 07:39:08 +09:00
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00
is_mobile.js Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01: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 Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115) 2020-02-18 17:22:44 +01:00
main.js Fix browser notification permission request logic (#13543) 2020-10-13 00:37:21 +02:00
performance.js
ready.js
scroll.js
settings.js
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
uuid.js