Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
accounts	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01:00
admin	…
announcements	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps	…
featured_tags	…
instances	Fix `GET /api/v1/instance` REST APIs being unavailable in secure mode (#12089)	2019-10-06 22:11:29 +02:00
lists	…
polls	…
push	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
statuses	Hide blocked users from more places (#12733)	2019-12-31 00:55:32 +01:00
timelines	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
accounts_controller.rb	…
announcements_controller.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	Support min_id-based pagination for bookmarks (#12381)	2019-11-17 17:09:41 +01:00
conversations_controller.rb	…
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	…
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
instances_controller.rb	Fix `GET /api/v1/instance` REST APIs being unavailable in secure mode (#12089)	2019-10-06 22:11:29 +02:00
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
mutes_controller.rb	…
notifications_controller.rb	…
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	Fix attachment not being re-downloaded even if file is not stored (#12125)	2019-10-09 07:10:46 +02:00
suggestions_controller.rb	…
trends_controller.rb	…