Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js

2018-09-19 21:46:01 +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

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +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 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

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

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

status_serializer.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-17 17:43:54 +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