nyastodon/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.
2018-07-09 07:13:59 +02:00
..
v1 Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +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 more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +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