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
..
admin	Avoid deleted attributes when building a Status from action log (fixes #8371) (#8373)	6 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	7 years ago
home_helper.rb	Add remote interaction dialog for toots (#8202)	6 years ago
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	6 years ago
jsonld_helper.rb	Improve federated ID validation (#8372)	6 years ago
mailer_helper.rb	HTML e-mails for UserMailer (#6256)	6 years ago
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	6 years ago
settings_helper.rb	Add Georgian language translation (#8250)	6 years ago
stream_entries_helper.rb	Make unfollow button light up red when hovered (#8286)	6 years ago