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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		5 years ago
..
admin	Add moderation API (#9387)	5 years ago
account_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application_serializer.rb	Add vapid_key to the application entity in the REST API (#10058)	6 years ago
context_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago
conversation_serializer.rb	Add unread indicator to conversations (#9009)	6 years ago
credential_account_serializer.rb	Allow selecting default posting language instead of auto-detect (#7828)	7 years ago
custom_emoji_serializer.rb	Add categories for custom emojis (#11196)	5 years ago
featured_tag_serializer.rb	Add featured tags API (#11778)	5 years ago
filter_serializer.rb	Fix filter ID not being a string in REST API (#9303)	6 years ago
identity_proof_serializer.rb	squashed identity proof updates (#10375)	6 years ago
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
list_serializer.rb	Add backend support to read and update list-specific show_replies settings	6 years ago
marker_serializer.rb	Add timeline read markers API (#11762)	5 years ago
media_attachment_serializer.rb	Add blurhash (#10630)	6 years ago
mute_serializer.rb	Define a serializer for /api/v1/mutes/details	7 years ago
notification_serializer.rb	Support pushing and receiving updates to poll tallies (#10209)	6 years ago
poll_serializer.rb	Add support for custom emojis in poll options (#10322)	6 years ago
preferences_serializer.rb	Add a preferences API so apps can share basic behaviours (#10109)	6 years ago
preview_card_serializer.rb	Add embed_url to preview cards (#5775)	7 years ago
relationship_serializer.rb	Improve blocked view of profiles (#10491)	6 years ago
report_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	7 years ago
scheduled_status_serializer.rb	Fix wrong param name in scheduled statuses and return params in API (#9725)	6 years ago
search_serializer.rb	Remove deprecated `GET /api/v1/search` API (#11823)	5 years ago
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tag_serializer.rb	Track trending tags (#7638)	7 years ago
web_push_subscription_serializer.rb	Fix `alerts` booleans not being typecast correctly in push subscription (#11343)	5 years ago