You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
v2	…
account_serializer.rb	Add a per-user setting to hide followers count	6 years ago
application_serializer.rb	Add vapid_key to the application entity in the REST API (#10058)	6 years ago
context_serializer.rb	…
conversation_serializer.rb	Add unread indicator to conversations (#9009)	6 years ago
credential_account_serializer.rb	…
custom_emoji_serializer.rb	…
filter_serializer.rb	Fix filter ID not being a string in REST API (#9303)	6 years ago
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
list_serializer.rb	Add backend support to read and update list-specific show_replies settings	6 years ago
media_attachment_serializer.rb	…
mute_serializer.rb	…
notification_serializer.rb	…
preview_card_serializer.rb	…
relationship_serializer.rb	…
report_serializer.rb	…
scheduled_status_serializer.rb	Fix wrong param name in scheduled statuses and return params in API (#9725)	6 years ago
search_serializer.rb	…
status_serializer.rb	Make displaying application used to toot opt-in (#9897)	6 years ago
tag_serializer.rb	…
web_push_subscription_serializer.rb	…