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 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.		6 years ago
..
account/components	Wait until relationship is loaded before showing follow button (#8440)	6 years ago
account_gallery	Do not scroll up when modal is opened (#8095)	6 years ago
account_timeline	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
blocks	Do not scroll up when modal is opened (#8095)	6 years ago
community_timeline	Add aria-label to column regions (#8390)	6 years ago
compose	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
direct_timeline	Add aria-label to column regions (#8390)	6 years ago
domain_blocks	Do not scroll up when modal is opened (#8095)	6 years ago
emoji	Fix issues with updated emoji mart (#7761)	6 years ago
favourited_statuses	Add aria-label to column regions (#8390)	6 years ago
favourites	Do not scroll up when modal is opened (#8095)	6 years ago
follow_requests	Do not scroll up when modal is opened (#8095)	6 years ago
followers	Do not scroll up when modal is opened (#8095)	6 years ago
following	Do not scroll up when modal is opened (#8095)	6 years ago
generic_not_found	Replace sprockets/browserify with Webpack (#2617)	7 years ago
getting_started	Add aria-label to column regions (#8390)	6 years ago
hashtag_timeline	Add aria-label to column regions (#8390)	6 years ago
home_timeline	Add aria-label to column regions (#8390)	6 years ago
keyboard_shortcuts	Improve keyboard shortcuts descriptions (#8066)	6 years ago
list_editor	Upgrade ESLint to version 4.x (#6276)	6 years ago
list_timeline	Add aria-label to column regions (#8390)	6 years ago
lists	Change list icons different from the getting-started icons (#7838)	6 years ago
mutes	Do not scroll up when modal is opened (#8095)	6 years ago
notifications	Add aria-label to column regions (#8390)	6 years ago
pinned_statuses	Do not scroll up when modal is opened (#8095)	6 years ago
public_timeline	Add aria-label to column regions (#8390)	6 years ago
reblogs	Do not scroll up when modal is opened (#8095)	6 years ago
report	Add missing video descriptions (#8416)	6 years ago
standalone	Add aria-label to column regions (#8390)	6 years ago
status	Weblate translations (2018-08-25) (#8420)	6 years ago
ui	Add hotkey for follow requests (#8307)	6 years ago
video	Add missing video descriptions (#8416)	6 years ago