tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/serializers/activitypub
History
Claire cd87d7dcef Merge branch 'main' into glitch-soc/merge-upstream 
- `.env.production.sample`:
  Our sample config file is very different from upstream since it is much more
  complete. Upstream added documentation for a few env variables.
  Copied the new variables/documentation from upstream.
- `app/lib/feed_manager.rb`:
  Upstream added a timeline type (hashtags), while glitch-soc already had an
  extra one (direct messages). Not really a conflict but textually close
  changes.
  Ported upstream's changes.
- `app/models/custom_emoji.rb`:
  Upstream upped the custom emoji size limit, while glitch-soc had configurable
  limits.
  Upped the default limits accordingly.
- `streaming/index.js`:
  Upstream reworked how hastags were normalized. Minor conflict due to
  glitch-soc's handling of instance-local posts.
  Ported upstream's changes.
 		2022-07-17 22:07:20 +02:00
..
accept_follow_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
activity_serializer.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
actor_serializer.rb Refactor account and status formatting (#17877) 2022-03-28 01:17:17 +02:00
add_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
block_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
collection_serializer.rb Add featured hashtags as an ActivityPub collection (#11595) 2020-09-02 02:11:12 +02:00
delete_actor_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
delete_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
device_serializer.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
emoji_serializer.rb Fix activity being rendered within activity due to caching (#11271) 2019-07-10 00:43:30 +02:00
encrypted_message_serializer.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
flag_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
follow_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
hashtag_serializer.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
image_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
like_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
move_serializer.rb Add account migration UI (#11846) 2019-09-19 20:58:19 +02:00
note_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
one_time_key_serializer.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
outbox_serializer.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
public_key_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
reject_follow_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
remove_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
undo_announce_serializer.rb Fix Undo Announce sometimes inlining the originally Announced status (#17516) 2022-02-11 14:52:07 +01:00
undo_block_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
undo_follow_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
undo_like_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
update_poll_serializer.rb Fix account URI in UpdatePollSerializer (#11194) 2019-06-27 19:41:55 +02:00
update_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00
vote_serializer.rb Remove unused ActivityPub `@context` values depending on response (#10378) 2019-03-27 15:55:23 +01:00