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

Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.

2018-09-11 16:51:26 +02:00

..

v1

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

2018-08-31 19:10:57 +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

Add force_login option to OAuth authorize page (#8655)

2018-09-09 04:10:44 +02:00

oembed_controller.rb

Update status embeds (#4742)

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

push_controller.rb

…

salmon_controller.rb

Fix response of signature_verification_failure_reason (#6441)

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

subscriptions_controller.rb

…