Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.		2019-08-30 13:38:41 +02:00
..
accounts	Fix error in REST API for an account's statuses (#11700)	2019-08-30 02:49:44 +02:00
admin	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00
apps
instances	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
lists
polls
push
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-29 12:07:50 +02:00
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
directories_controller.rb	Add profile directory to web UI (#11688)	2019-08-30 00:14:36 +02:00
domain_blocks_controller.rb
endorsements_controller.rb
favourites_controller.rb	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
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	Add soft delete for statuses for instant deletes through API (#11623)	2019-08-22 21:55:56 +02:00
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 branch 'master' into glitch-soc/merge-upstream	2019-08-29 12:07:50 +02:00
streaming_controller.rb
suggestions_controller.rb
trends_controller.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02:00