Thibaut Girka 4f4908311d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml		2018-08-27 18:09:28 +02:00
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +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	Allow mods to disable login, improve message when login disabled (#8329)	2018-08-23 23:26:29 +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