Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		2020-12-15 14:27:06 +01:00
..
account	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
account_gallery	Change "Profile unavailable" string to "Account suspended" in web UI (#15345)	2020-12-14 09:08:09 +01:00
account_timeline	Change "Profile unavailable" string to "Account suspended" in web UI (#15345)	2020-12-14 09:08:09 +01:00
audio	Add hotkeys for audio/video control (#15158)	2020-11-15 14:24:54 +01:00
blocks	…
bookmarked_statuses	…
community_timeline	…
compose	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
direct_timeline	Freeze scroll position when a dropdown menu is open in the TL (#14271)	2020-07-09 15:09:19 +02:00
directory	Replace shortNumberFormat with <ShortNumber> (#14061)	2020-07-06 14:27:32 +02:00
domain_blocks	…
emoji	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	2020-10-13 01:19:35 +02:00
favourited_statuses	…
favourites	…
follow_requests	…
followers	Fix the conditions for incomplete remote content (#14195)	2020-07-01 23:38:44 +02:00
following	Fix the conditions for incomplete remote content (#14195)	2020-07-01 23:38:44 +02:00
generic_not_found	…
getting_started	Mark correctly as read reverse-order announcements (#15070)	2020-11-19 17:40:18 +01:00
hashtag_timeline	Fix hashtag column options styling (#14247)	2020-07-07 01:33:38 +02:00
home_timeline	…
introduction	Add option to disable swiping motions across the WebUI (#13885)	2020-09-30 19:31:03 +02:00
keyboard_shortcuts	…
list_adder	…
list_editor	…
list_timeline	rename replies_policy enumerables (#15304)	2020-12-09 04:34:17 +01:00
lists	…
mutes	…
notifications	Fix notifications being unnecessarily redrawn on state change (#15312)	2020-12-09 19:16:30 +01:00
picture_in_picture	Change media modals look in web UI (#15217)	2020-11-27 03:24:11 +01:00
pinned_statuses	…
public_timeline	…
reblogs	…
report	…
search	…
standalone	…
status	Fix missing pictureInPicture prop in detailed status container (#15309)	2020-12-09 04:33:33 +01:00
ui	Fix column swiping animation logic (#15301)	2020-12-07 20:07:24 +01:00
video	Fix not being able to open audio modal in web UI (#15283)	2020-12-07 04:29:37 +01:00