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
..
admin	Add admin ability to remove an user's header image (#9495)	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	…
home_helper.rb	Make avatar and headers respect `auto_play_gif` (#9515)	6 years ago
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	7 years ago
jsonld_helper.rb	Improve federated ID validation (#8372)	6 years ago
mailer_helper.rb	HTML e-mails for UserMailer (#6256)	7 years ago
routing_helper.rb	Fallback default thumbnail in instance status API (#6177)	7 years ago
settings_helper.rb	Add Czech language option and locale data (#8594)	6 years ago
stream_entries_helper.rb	Redesign admin accounts index (#9340)	6 years ago