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 a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc		6 years ago
..
account/components	Improve blocked view of profiles (#10491)	6 years ago
account_gallery	Fix glitched out "not found" message for non-existing profiles in web UI (#10517)	6 years ago
account_timeline	Fix glitched out "not found" message for non-existing profiles in web UI (#10517)	6 years ago
blocks	…
community_timeline	…
compose	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
direct_timeline	Remove unused code (#10426)	6 years ago
domain_blocks	…
emoji	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)	6 years ago
favourited_statuses	…
favourites	…
follow_requests	…
followers	Fix glitched out "not found" message for non-existing profiles in web UI (#10517)	6 years ago
following	Fix glitched out "not found" message for non-existing profiles in web UI (#10517)	6 years ago
generic_not_found	…
getting_started	Configrationable repository url (#10600)	6 years ago
hashtag_timeline	…
home_timeline	…
introduction	…
keyboard_shortcuts	…
list_adder	…
list_editor	…
list_timeline	…
lists	…
mutes	…
notifications	…
pinned_statuses	…
public_timeline	…
reblogs	…
report	…
standalone	…
status	tinyfix 2: unrequired arguments (#10471)	6 years ago
ui	Fix modal items cannot scroll on touch devices (#10605)	6 years ago
video	…