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 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		6 years ago
..
account/components	Improve blocked view of profiles (#10491)	6 years ago
account_gallery	Bring back crossed eye icon on gallery (#10715)	6 years ago
account_timeline	Fix glitched out "not found" message for non-existing profiles in web UI (#10517)	6 years ago
blocks	Fix mutes, blocks, domain blocks and follow requests not paginating (#10057)	6 years ago
community_timeline	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
compose	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
direct_timeline	When selecting a toot via keyboard, ensure it is scrolled into view (#10593)	6 years ago
domain_blocks	Fix mutes, blocks, domain blocks and follow requests not paginating (#10057)	6 years ago
emoji	Fix emoji-mart crashing web UI on search by reverting the upgrade to 2.10.0 (#10413)	6 years ago
favourited_statuses	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
favourites	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
follow_requests	Improvements to the single column layout (#10835)	6 years ago
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	Replace sprockets/browserify with Webpack (#2617)	8 years ago
getting_started	Refactor footers in web UI into a single component (#10846)	6 years ago
hashtag_timeline	Fix hashtag column not subscribing to stream on mount (#10040)	6 years ago
home_timeline	Fix home timeline perpetually reloading when empty (#10130)	6 years ago
introduction	change "finish tutorial" text to "finish toot-orial" (#9905)	6 years ago
keyboard_shortcuts	Add a keyboard shortcut to hide/show media (#10647)	6 years ago
list_adder	Refactor icons in web UI to use Icon component (#9951)	6 years ago
list_editor	Add list title editing (#9748)	6 years ago
list_timeline	Improve light theme (#10992)	6 years ago
lists	Improve light theme (#10992)	6 years ago
mutes	Fix mutes, blocks, domain blocks and follow requests not paginating (#10057)	6 years ago
notifications	When selecting a toot via keyboard, ensure it is scrolled into view (#10593)	6 years ago
pinned_statuses	Revert Font Awesome 5 upgrade (#8810)	6 years ago
public_timeline	Rename from instance to server. (#9938)	6 years ago
reblogs	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
report	Add blurhash (#10630)	6 years ago
search	Add responsive panels to the single-column layout (#10820)	6 years ago
standalone	Disable real-time updates on public pages to improve readability (#10260)	6 years ago
status	Put poll options behind content warnings (#10983)	6 years ago
ui	Add profile directory link to single column navigation panel (#10963)	6 years ago
video	Add a keyboard shortcut to hide/show media (#10647)	6 years ago