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 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		6 years ago
..
admin	Prevent actions log from crashing when displaying deleted status (fixes #8133) (#8219)	6 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)	7 years ago
home_helper.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	6 years ago
jsonld_helper.rb	Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)	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)	7 years ago
settings_helper.rb	i18n: fix Slovak language name (#8169)	6 years ago
stream_entries_helper.rb	Redesign public profiles and toots (#8068)	6 years ago