You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/controllers/api
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
7 years ago
..
v1 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
v2 Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661) 7 years ago
web Add REST API for Web Push Notifications subscriptions (#7445) 7 years ago
base_controller.rb Allow mods to disable login, improve message when login disabled (#8329) 7 years ago
oembed_controller.rb
push_controller.rb
salmon_controller.rb Fix response of signature_verification_failure_reason (#6441) 7 years ago
subscriptions_controller.rb