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 f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x		6 years ago
..
admin	Improvements to toots display in admin view (#7452)	7 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
application_helper.rb	Add more granular OAuth scopes (#7929)	6 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	8 years ago
home_helper.rb	Improve initialState loading	8 years ago
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	7 years ago
jsonld_helper.rb	Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)	7 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	Weblate translations (2018-07-05) (#7950)	6 years ago
stream_entries_helper.rb	Display full acct on public status pages, always (#8011)	6 years ago