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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
8 years ago
..
v1 Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
v2 Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661) 8 years ago
web Add REST API for Web Push Notifications subscriptions (#7445) 8 years ago
base_controller.rb Add more granular OAuth scopes (#7929) 8 years ago
oembed_controller.rb Update status embeds (#4742) 9 years ago
push_controller.rb Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205) 9 years ago
salmon_controller.rb Fix response of signature_verification_failure_reason (#6441) 8 years ago
subscriptions_controller.rb HTTP signatures (#4146) 9 years ago