mastodon/app/controllers/api
David Yip 16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
2018-04-18 18:48:12 -05:00
..
v1 Direct messages column (#4514) 2018-04-18 13:09:06 +02:00
web Improve web api protect (#6343) 2018-04-17 15:23:46 +02:00
base_controller.rb Ensure that boolean params in the API are parsed for truthiness (#6575) 2018-03-01 02:47:59 +01: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