You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.		5 years ago
..
account	remove unused word. (#14250)	5 years ago
account_gallery	Fix audio and video items in account gallery in web UI (#14282)	5 years ago
account_timeline	Fix/14021 behaviour on add or remove toots (#14212)	5 years ago
audio	Fix error when closing a playing audio or video modal (#14310)	5 years ago
blocks	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445)	5 years ago
bookmarked_statuses	…
community_timeline	…
compose	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
direct_timeline	Freeze scroll position when a dropdown menu is open in the TL (#14271)	5 years ago
directory	Replace shortNumberFormat with <ShortNumber> (#14061)	5 years ago
domain_blocks	Change the string "hidden" to "blocked" in WebUI (#13221)	5 years ago
emoji	Fixed emoji detection problem to append border (#14020)	5 years ago
favourited_statuses	…
favourites	Code style improvements in JavaScript (#13159)	5 years ago
follow_requests	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445)	5 years ago
followers	Fix the conditions for incomplete remote content (#14195)	5 years ago
following	Fix the conditions for incomplete remote content (#14195)	5 years ago
generic_not_found	…
getting_started	Fix frontend crash when deleting announcements (#13312)	5 years ago
hashtag_timeline	Fix hashtag column options styling (#14247)	5 years ago
home_timeline	Change how unread announcements are handled (#13020)	5 years ago
introduction	…
keyboard_shortcuts	Add hotkey for toggling content warning composer field (#13987)	5 years ago
list_adder	…
list_editor	…
list_timeline	…
lists	Code style improvements in JavaScript (#13159)	5 years ago
mutes	Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445)	5 years ago
notifications	Add follow_request notification type (#12198)	5 years ago
pinned_statuses	…
public_timeline	Add remote only to public timeline (#13504)	5 years ago
reblogs	Code style improvements in JavaScript (#13159)	5 years ago
report	…
search	…
standalone	Add local only to hashtag timeline (#13502)	5 years ago
status	Replace repetitive blurhash code with component (#14267)	5 years ago
ui	Add a visibility icon to boost modal (#14292)	5 years ago
video	Fix error when closing a playing audio or video modal (#14310)	5 years ago