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 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		5 years ago
..
account_associations.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_avatar.rb	Remove WebP support (#11589)	5 years ago
account_counters.rb	Add `tootctl cache recount` command (#11597)	5 years ago
account_finder_concern.rb	Add ActivityPub actor representing the entire server (#11321)	5 years ago
account_header.rb	Remove WebP support (#11589)	5 years ago
account_interactions.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
attachmentable.rb	Fix performance of GIF re-encoding (#12057)	5 years ago
cacheable.rb	Fix cache_associated no longer working (#7320)	7 years ago
domain_normalizable.rb	Fix crash when saving invalid domain name (#11528)	5 years ago
expireable.rb	Fix poll update handler calling method was that was not available (#10246)	6 years ago
ldap_authenticable.rb	Fix authentication before 2FA challenge (#11943)	5 years ago
omniauthable.rb	Fix SSO login not using existing account when e-mail is verified (#11862)	5 years ago
paginable.rb	Fix timeline pagination (#8827)	6 years ago
pam_authenticable.rb	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	6 years ago
redisable.rb	Create Redisable#redis (#9633)	6 years ago
relationship_cacheable.rb	Cache relationships in API (#6482)	7 years ago
remotable.rb	Fix attachment not being re-downloaded even if file is not stored (#12125)	5 years ago
status_threading_concern.rb	Improved remote thread fetching (#10106)	6 years ago
user_roles.rb	Add moderation API (#9387)	5 years ago