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 f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
account/components	Implement adding a user to a list from their profile (#9062)	6 years ago
account_gallery	Add a new preference to always hide all media (#8569)	6 years ago
account_timeline	Use local instead of global loading indicator for timelines, account timelines (#9224)	6 years ago
blocks	Upgrade Babel to version 7.0.0 (#5925)	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	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
emoji	When searching for an emoji with multiple separators, consider the full input (#9124)	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	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
followers	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
following	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
generic_not_found	…
getting_started	Change documentation URL (#8898)	6 years ago
hashtag_timeline	Deep compare tags for hashtag column reload (#9297)	6 years ago
home_timeline	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
keyboard_shortcuts	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
list_adder	Implement adding a user to a list from their profile (#9062)	6 years ago
list_editor	Revert Font Awesome 5 upgrade (#8810)	6 years ago
list_timeline	Revert Font Awesome 5 upgrade (#8810)	6 years ago
lists	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
mutes	Upgrade Babel to version 7.0.0 (#5925)	6 years ago
notifications	Fix loading indicator inconsistency (#9252)	6 years ago
pinned_statuses	Revert Font Awesome 5 upgrade (#8810)	6 years ago
public_timeline	Upgrade Babel to version 7.0.0 (#5925)	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	Allow joining several hashtags in a single column (#8904)	6 years ago
status	Fix null error introduced in #9270 (#9275)	6 years ago
ui	Implement adding a user to a list from their profile (#9062)	6 years ago
video	Volume sliders for videos #7429 (#9366)	6 years ago