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

..

account/components

Add basic support for group actors (#12071)

2019-12-04 20:36:33 +01:00

account_gallery

…

account_timeline

Add “account timeline” filter category (#12918)

2020-01-23 21:32:00 +01:00

audio

Change audio/video playback to stop playback when out of view (#12486)

2020-01-11 02:02:21 +01:00

blocks

…

bookmarked_statuses

…

community_timeline

…

compose

Merge branch 'master' into glitch-soc/merge-upstream

2020-01-24 14:37:06 +01:00

direct_timeline

Fix conversations not having an unread indicator in web UI (#12506)

2019-12-01 07:06:20 +01:00

directory

Fix unfollow confirmations in account directory (#12922)

2020-01-22 16:26:47 +01:00

domain_blocks

…

emoji

…

favourited_statuses

…

favourites

…

follow_requests

…

followers

…

following

…

generic_not_found

…

getting_started

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

hashtag_timeline

…

home_timeline

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

introduction

…

keyboard_shortcuts

Add hotkey for opening media files (#12498)

2019-11-29 17:02:35 +01:00

list_adder

…

list_editor

…

list_timeline

…

lists

…

mutes

…

notifications

Add follow_request notification type (#12198)

2019-12-01 17:25:29 +01:00

pinned_statuses

…

public_timeline

…

reblogs

…

report

…

search

…

standalone

…

status

Fix reuse of detailed status components (#12792)

2020-01-06 18:22:17 +01:00

ui

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

video

Change audio/video playback to stop playback when out of view (#12486)

2020-01-11 02:02:21 +01:00