Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.		2019-02-17 12:26:55 +01: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	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	Allow selecting default posting language instead of auto-detect (#7828)	2018-06-17 18:57:31 +02:00
custom_emoji_serializer.rb	Feature: Unlisted custom emojis (#5485)	2017-10-27 16:11:30 +02: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 'master' into glitch-soc/merge-upstream	2019-02-17 12:26:55 +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	In REST API, when URL can be missing, cast it to nil (#5259)	2017-10-07 18:55:48 +02:00
mute_serializer.rb	Define a serializer for /api/v1/mutes/details	2017-09-13 21:47:30 -05:00
notification_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	2017-09-20 14:53:48 +02:00
preview_card_serializer.rb	Add embed_url to preview cards (#5775)	2017-12-07 03:37:43 +01:00
relationship_serializer.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +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
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	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
status_serializer.rb	Make displaying application used to toot opt-in (#9897)	2019-02-02 19:18:15 +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