Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/media_attachment.rb

2019-05-04 16:37:26 +02:00

..

v2

…

account_serializer.rb

…

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

…

conversation_serializer.rb

…

credential_account_serializer.rb

…

custom_emoji_serializer.rb

…

filter_serializer.rb

…

identity_proof_serializer.rb

squashed identity proof updates (#10375)

2019-03-28 18:01:09 +01:00

instance_serializer.rb

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

2019-03-16 14:14:20 +01:00

list_serializer.rb

…

media_attachment_serializer.rb

Add blurhash (#10630)

2019-04-27 03:24:09 +02:00

mute_serializer.rb

…

notification_serializer.rb

Support pushing and receiving updates to poll tallies (#10209)

2019-03-11 00:49:31 +01:00

poll_serializer.rb

Add support for custom emojis in poll options (#10322)

2019-03-20 17:29:12 +01: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

…

relationship_serializer.rb

Improve blocked view of profiles (#10491)

2019-04-07 04:59:13 +02:00

report_serializer.rb

…

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

…

status_serializer.rb

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

2019-03-28 13:01:33 +01:00

tag_serializer.rb

…

web_push_subscription_serializer.rb

…