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 f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		6 years ago
..
account/components	Refactor icons in web UI to use Icon component (#9951)	6 years ago
account_gallery	Refactor icons in web UI to use Icon component (#9951)	6 years ago
account_timeline	Refactor icons in web UI to use Icon component (#9951)	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	Fix direct messages column not loading more items on scroll (#9102)	6 years ago
domain_blocks	Fix mutes, blocks, domain blocks and follow requests not paginating (#10057)	6 years ago
emoji	Update emoji codepoint mappings to v11.0 (#9618)	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	Fix mutes, blocks, domain blocks and follow requests not paginating (#10057)	6 years ago
followers	Various fixes to scrollable lists and media gallery (#9501)	6 years ago
following	Various fixes to scrollable lists and media gallery (#9501)	6 years ago
generic_not_found	…
getting_started	Rename from instance to server. (#9938)	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	Upgrade Babel to version 7.0.0 (#5925)	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	Refactor icons in web UI to use Icon component (#9951)	6 years ago
lists	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
mutes	Fix mutes, blocks, domain blocks and follow requests not paginating (#10057)	6 years ago
notifications	Fix timeline jumps (#10001)	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 missing video descriptions (#8416)	6 years ago
standalone	Improve the public hashtag page (#9831)	6 years ago
status	Add polls (#10111)	6 years ago
ui	Rename from instance to server. (#9938)	6 years ago
video	Fix video player width not being updated to fit container width (#10069)	6 years ago