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 e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		6 years ago
..
v2	Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)	7 years ago
account_serializer.rb	Do not pre-emojify note HTML in accounts REST API (#7821)	7 years ago
application_serializer.rb	In REST API, when URL can be missing, cast it to nil (#5259)	7 years ago
context_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago
credential_account_serializer.rb	Allow selecting default posting language instead of auto-detect (#7828)	7 years ago
custom_emoji_serializer.rb	Feature: Unlisted custom emojis (#5485)	7 years ago
filter_serializer.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	6 years ago
instance_serializer.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
list_serializer.rb	Display list column (#5750)	7 years ago
media_attachment_serializer.rb	In REST API, when URL can be missing, cast it to nil (#5259)	7 years ago
mute_serializer.rb	Define a serializer for /api/v1/mutes/details	7 years ago
notification_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	7 years ago
preview_card_serializer.rb	Add embed_url to preview cards (#5775)	7 years ago
relationship_serializer.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
report_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	7 years ago
search_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	7 years ago
status_serializer.rb	Add backend support for bookmarks	7 years ago
tag_serializer.rb	Track trending tags (#7638)	7 years ago
web_push_subscription_serializer.rb	Add REST API for Web Push Notifications subscriptions (#7445)	7 years ago