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

Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb

2018-10-01 12:43:20 +02:00

..

v1

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

2018-10-01 12:43:20 +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

web

Add REST API for Web Push Notifications subscriptions (#7445)

2018-05-11 11:49:12 +02:00

base_controller.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

oembed_controller.rb

Update status embeds (#4742)

2017-08-30 10:23:43 +02:00

push_controller.rb

Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)

2017-07-14 23:01:20 +02:00

salmon_controller.rb

Fix response of signature_verification_failure_reason (#6441)

2018-02-08 05:00:45 +01:00

subscriptions_controller.rb

HTTP signatures (#4146)

2017-07-14 20:41:49 +02:00