1
0
puyopuyotetr.is/app/javascript/styles/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
..
_mixins.scss Revert "Avoid using uppercase text-transform (#12684)" (#12987) 2020-01-27 13:44:29 +01:00
about.scss Remove duplicate CSS properties (#16278) 2021-05-19 23:51:52 +02:00
accessibility.scss Improve rendering of emoji which do not contrast with background (#13772) 2020-06-09 10:28:23 +02:00
accounts.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
basics.scss Fix various issues around OpenGraph representation of media (#14133) 2020-06-25 01:33:01 +02:00
boost.scss Fix styling of boost button in media modal not reflecting ability to boost (#16387) 2021-06-25 04:45:30 +02:00
compact_header.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
components.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-01-19 23:52:48 +01:00
containers.scss Fix logo button style more (#15458) 2020-12-30 23:18:39 +01:00
dashboard.scss Add trending links (#16917) 2021-11-25 13:07:38 +01:00
emoji_picker.scss Fix background-color of emoji-mart selector (#17011) 2021-11-19 18:21:37 +01:00
footer.scss Revert "Avoid using uppercase text-transform (#12684)" (#12987) 2020-01-27 13:44:29 +01:00
forms.scss Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
introduction.scss Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Use custom mascot on static share page (#15687) 2021-02-11 02:18:56 +01:00
polls.scss Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
reset.scss Fix Firefox scrollbar color regression in #9210 (#9908) 2019-01-24 13:32:23 +01:00
rtl.scss Improve hover and focus style in columns settings (#16222) 2021-10-01 00:55:51 +02:00
statuses.scss Fix logo button style more (#15458) 2020-12-30 23:18:39 +01:00
tables.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
variables.scss Add interrelationship icon (#15149) 2020-11-12 17:43:12 +01:00
widgets.scss Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00