You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		5 years ago
..
accept_follow_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
activity_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	5 years ago
actor_serializer.rb	Add ActivityPub actor representing the entire server (#11321)	5 years ago
add_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
block_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
collection_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	5 years ago
delete_actor_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
delete_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
emoji_serializer.rb	Fix activity being rendered within activity due to caching (#11271)	5 years ago
flag_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
follow_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
image_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
like_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
note_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
outbox_serializer.rb	Federate pinned statuses over ActivityPub (#6610)	7 years ago
public_key_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
reject_follow_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
remove_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
undo_announce_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
undo_block_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
undo_follow_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
undo_like_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
update_poll_serializer.rb	Fix account URI in UpdatePollSerializer (#11194)	5 years ago
update_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
vote_serializer.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago