luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-29 01:53:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/serializers/rest
History
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.
2018-08-10 16:22: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 Do not pre-emojify note HTML in accounts REST API (#7821) 2018-06-16 18:47:19 +02:00
application_serializer.rb In REST API, when URL can be missing, cast it to nil (#5259) 2017-10-07 18:55:48 +02:00
context_serializer.rb
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 Add option to not consider word boundaries when processing keyword filtering (#7975) 2018-07-09 02:22:09 +02:00
instance_serializer.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00
list_serializer.rb Display list column (#5750) 2017-11-25 00:35:37 +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
search_serializer.rb
status_serializer.rb Add backend support for bookmarks 2018-04-11 20:40:29 +02: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