Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

v2

Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)

2018-05-29 02:01:24 +02:00

account_serializer.rb

Add a per-user setting to hide followers count

2018-12-20 14:51:12 +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

…

conversation_serializer.rb

Add unread indicator to conversations (#9009)

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

credential_account_serializer.rb

Allow selecting default posting language instead of auto-detect (#7828)

2018-06-17 18:57:31 +02:00

custom_emoji_serializer.rb

…

filter_serializer.rb

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

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

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

Add backend support to read and update list-specific show_replies settings

2018-11-28 14:46:07 +01:00

media_attachment_serializer.rb

…

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

Hide blocking accounts from blocked users (#10442)

2019-04-01 20:06: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

Track trending tags (#7638)

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

web_push_subscription_serializer.rb

Add REST API for Web Push Notifications subscriptions (#7445)

2018-05-11 11:49:12 +02:00