Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.

2022-05-11 09:37:48 +02:00

..

admin

Change design of federation pages in admin UI (#17704)

2022-03-09 08:52:32 +01: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

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

Add vapid_key to the application entity in the REST API (#10058)

2019-02-16 05:27:05 +01:00

context_serializer.rb

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

conversation_serializer.rb

Add unread indicator to conversations (#9009)

2018-10-19 01:47:29 +02:00

credential_account_serializer.rb

Change silences to always require approval on follow (#11975)

2019-09-27 21:13:51 +02:00

custom_emoji_serializer.rb

Add categories for custom emojis (#11196)

2019-06-28 15:54:10 +02:00

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_serializer.rb

Fix filter ID not being a string in REST API (#9303)

2018-11-19 10:37:57 +01:00

instance_serializer.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-07-11 21:41:23 +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

Add timeline read markers API (#11762)

2019-09-06 13:55:51 +02:00

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

Define a serializer for /api/v1/mutes/details

2017-09-13 21:47:30 -05:00

muted_account_serializer.rb

Add duration parameter to muting. (#13831)

2020-10-13 01:01:14 +02:00

notification_serializer.rb

Add notifications when a reblogged status has been updated (#17404)

2022-02-11 22:20:19 +01:00

poll_serializer.rb

Add voters count support (#11917)

2019-09-29 22:58:01 +02:00

preferences_serializer.rb

Add a preferences API so apps can share basic behaviours (#10109)

2019-03-15 02:39:20 +01:00

preview_card_serializer.rb

Add blurhash to preview cards (#13984)

2020-06-05 23:10:41 +02:00

reaction_serializer.rb

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

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

Change IDs to strings rather than numbers in API JSON output (#5019)

2017-09-20 14:53:48 +02:00

rule_serializer.rb

Add server rules (#15769)

2021-02-21 19:50:12 +01:00

scheduled_status_serializer.rb

Fix wrong param name in scheduled statuses and return params in API (#9725)

2019-01-06 12:03:27 +01:00

search_serializer.rb

Remove deprecated GET /api/v1/search API (#11823)

2019-09-13 16:11:13 +02:00

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-04-06 16:06:15 +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

Track trending tags (#7638)

2018-05-27 21:45:30 +02:00

web_push_subscription_serializer.rb

Fix alerts booleans not being typecast correctly in push subscription (#11343)

2019-07-21 18:10:07 +02:00