Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock		2019-07-30 12:22:33 +02:00
..
accounts
admin	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00
apps	Add vapid_key to the application entity in the REST API (#10058)	2019-02-16 05:27:05 +01:00
instances	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
lists
polls
push
statuses
timelines	Remove deprecated REST API GET /api/v1/timelines/direct (#11212)	2019-07-05 02:14:56 +02:00
accounts_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
apps_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
blocks_controller.rb
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	2019-07-21 22:32:16 +02:00
domain_blocks_controller.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
endorsements_controller.rb
favourites_controller.rb
filters_controller.rb
follow_requests_controller.rb
instances_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
lists_controller.rb
media_controller.rb
mutes_controller.rb
notifications_controller.rb
polls_controller.rb
preferences_controller.rb
reports_controller.rb
scheduled_statuses_controller.rb
search_controller.rb	Add env variable to control search limit	2019-07-20 16:39:48 +02:00
statuses_controller.rb	Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream	2019-07-07 13:49:31 +02:00
streaming_controller.rb
suggestions_controller.rb