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 f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	WebSub: ATOM before RSS (#9302)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	Show remote reports in admin UI as coming from domain rather than user (#7347)	7 years ago
application	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
auth	Change the password form order (#9267)	6 years ago
authorize_interactions	Add remote interaction dialog for toots (#8202)	6 years ago
errors	…
filters	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
follower_accounts	Redesign public profiles and toots (#8068)	6 years ago
following_accounts	Redesign public profiles and toots (#8068)	6 years ago
home	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
invites	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	…
notification_mailer	…
oauth	…
remote_follow	Redesign public profiles and toots (#8068)	6 years ago
remote_interaction	Add remote interaction dialog for toots (#8202)	6 years ago
remote_unfollows	Redesign public profiles and toots (#8068)	6 years ago
settings	move some constants to rails environment	6 years ago
shared	Fix form validation flash message color and input borders (#9235)	6 years ago
shares	…
stream_entries	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	Merge branch 'master' into glitch-soc/merge	7 years ago
user_mailer	…
well_known	Add remote interaction dialog for toots (#8202)	6 years ago