David Yip c816701550

Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml

2018-05-03 17:23:44 -05:00

..

account_serializer.rb

Add bio fields (#6645)

2018-04-14 12:41:08 +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

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

credential_account_serializer.rb

Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)

2018-05-02 15:57:37 +02:00

custom_emoji_serializer.rb

Feature: Unlisted custom emojis (#5485)

2017-10-27 16:11:30 +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

Break out nested relationship API keys (#5887)

2017-12-06 16:10:54 +01: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

Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)

2017-07-07 04:02:06 +02:00

status_serializer.rb

Add backend support for bookmarks

2018-04-11 20:40:29 +02:00