FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/serializers/rest
History
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
 		2022-06-28 11:11:18 +02:00
..
admin Add notifications for new reports (#18697) 2022-06-27 09:30:15 +02:00
keys Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
trends Add trending links (#16917) 2021-11-25 13:07:38 +01:00
v1 Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
account_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
announcement_serializer.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
application_serializer.rb
…
context_serializer.rb
…
conversation_serializer.rb
…
credential_account_serializer.rb
…
custom_emoji_serializer.rb
…
encrypted_message_serializer.rb Fix wrong route helper in encrypted messages controller (#13952) 2020-06-03 20:32:15 +02:00
familiar_followers_serializer.rb Add `/api/v1/accounts/familiar_followers` to REST API (#17700) 2022-03-07 09:36:47 +01:00
featured_tag_serializer.rb Use existing FeaturedTag serializer and delete AccountFeaturedTag serializer (#15415) 2020-12-23 16:43:38 +01:00
filter_keyword_serializer.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
filter_result_serializer.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
filter_serializer.rb Revamp post filtering system (#18058) 2022-06-28 09:42:13 +02:00
instance_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
list_serializer.rb Add configuration option to filter replies in lists (#9205) 2020-09-01 13:31:28 +02:00
marker_serializer.rb
…
media_attachment_serializer.rb Stop setting a shortcode to newly-created media attachments (#16730) 2021-09-13 18:59:37 +02:00
mute_serializer.rb
…
muted_account_serializer.rb Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
notification_serializer.rb Add notifications for new reports (#18697) 2022-06-27 09:30:15 +02:00
poll_serializer.rb
…
preferences_serializer.rb Fix preferred posting language returning unusable value in REST API (#18428) 2022-05-16 19:13:36 +02:00
preview_card_serializer.rb Add blurhash to preview cards (#13984) 2020-06-05 23:10:41 +02:00
reaction_serializer.rb
…
relationship_serializer.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
report_serializer.rb Add notifications for new reports (#18697) 2022-06-27 09:30:15 +02:00
rule_serializer.rb Add server rules (#15769) 2021-02-21 19:50:12 +01:00
scheduled_status_serializer.rb
…
search_serializer.rb
…
status_edit_serializer.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
status_serializer.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
status_source_serializer.rb Add content-type to status source in glitch-soc 2022-01-20 00:03:44 +01:00
suggestion_serializer.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
tag_serializer.rb
…
web_push_subscription_serializer.rb
…