Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		2020-08-30 16:13:08 +02:00
..
account	Fix wrong proptypes for onEditAccountNote (#14481)	2020-08-02 11:20:02 +02:00
account_gallery	Fix audio and video items in account gallery in web UI (#14282)	2020-07-10 22:09:28 +02:00
account_timeline	Fix wrong proptypes for onEditAccountNote (#14481)	2020-08-02 11:20:02 +02:00
audio	Fix audio player on Safari (#14485)	2020-08-02 18:47:09 +02:00
blocks	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445)	2020-04-12 13:38:00 +02:00
bookmarked_statuses	Add bookmarks (#7107)	2019-11-13 23:02:10 +01:00
community_timeline	Fix unread toot indicator not honoring onlyMedia in public and community timelines (#12330)	2019-11-11 00:05:02 +02:00
compose	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-30 16:13:08 +02: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	Change the string "hidden" to "blocked" in WebUI (#13221)	2020-03-09 09:13:21 +01:00
emoji	Fixed emoji detection problem to append border (#14020)	2020-06-10 21:56:14 +02:00
favourited_statuses	Fix scroll to top in single column UI (#11463)	2019-08-01 19:17:17 +02:00
favourites	Code style improvements in JavaScript (#13159)	2020-03-08 16:02:36 +01:00
follow_requests	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445)	2020-04-12 13:38:00 +02:00
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	Fix performance of home feed regeneration (#12084)	2019-10-06 22:11:17 +02:00
getting_started	Fix frontend crash when deleting announcements (#13312)	2020-03-25 22:39:55 +01:00
hashtag_timeline	Fix hashtag column options styling (#14247)	2020-07-07 01:33:38 +02:00
home_timeline	Change how unread announcements are handled (#13020)	2020-02-03 01:53:09 +01:00
introduction
keyboard_shortcuts	Add hotkey for toggling content warning composer field (#13987)	2020-06-09 10:32:32 +02:00
list_adder
list_editor	Disable list title validation button when list title is empty (#11475)	2019-08-03 19:10:39 +02:00
list_timeline	Fix scroll to top in single column UI (#11463)	2019-08-01 19:17:17 +02:00
lists	Code style improvements in JavaScript (#13159)	2020-03-08 16:02:36 +01:00
mutes	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445)	2020-04-12 13:38:00 +02:00
notifications	Add follow_request notification type (#12198)	2019-12-01 17:25:29 +01:00
pinned_statuses	Fix scroll to top in single column UI (#11463)	2019-08-01 19:17:17 +02:00
public_timeline	Add remote only to public timeline (#13504)	2020-05-10 10:36:18 +02:00
reblogs	Code style improvements in JavaScript (#13159)	2020-03-08 16:02:36 +01:00
report
search	Add responsive panels to the single-column layout (#10820)	2019-05-25 21:27:00 +02:00
standalone	Add local only to hashtag timeline (#13502)	2020-04-18 21:52:39 +02:00
status	Fix: also use custom private boost icon for detailed status (#14471)	2020-08-24 14:13:44 +02:00
ui	Add a visibility icon to boost modal (#14292)	2020-07-12 15:22:48 +02:00
video	Fix error when closing a playing audio or video modal (#14310)	2020-07-15 21:07:53 +02:00