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 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.		6 years ago
..
account/components	Make avatar and headers respect `auto_play_gif` (#9515)	6 years ago
account_gallery	Various fixes to scrollable lists and media gallery (#9501)	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	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	Replace sprockets/browserify with Webpack (#2617)	8 years ago
getting_started	Change documentation URL (#8898)	6 years ago
hashtag_timeline	Fix that translation is not applied to "joining hashtags" (#9397)	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	Add visible dates for notifications in Notification column (#9423)	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