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	Add moderation note (#5240)	7 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
application_helper_spec.rb	Add theme identifier to body classes for easier custom CSS styling (#8439)	6 years ago
flashes_helper_spec.rb	Spec FlashesHelper (#3414)	8 years ago
home_helper_spec.rb	Fix locale related specs (#3707)	8 years ago
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	7 years ago
jsonld_helper_spec.rb	Append '.test' to hostname in stub data (#7260)	7 years ago
routing_helper_spec.rb	Use URI.join even when S3 enabled (#4652)	7 years ago
settings_helper_spec.rb	Fix language filter codes (#4841)	7 years ago
stream_entries_helper_spec.rb	Display full acct on public status pages, always (#8011)	6 years ago