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 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Move hide_followers_count logic to an helper	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	Escape HTML in profile name preview in profile settings (#9446)	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
directories	Move hide_followers_count logic to an helper	6 years ago
errors	New error page graphic. Other error page improvements (#5099)	7 years ago
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	Pagination improvements (#1445)	8 years ago
layouts	Restore oops.gif animation for user who have auto_play_gif set	6 years ago
media	Save video metadata and improve video OpenGraph tags (#6481)	7 years ago
notification_mailer	Display content warning in mail notification emails (#6832)	7 years ago
oauth	Oauth code in input form and add description message (#4986)	7 years ago
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	Add a per-user setting to hide followers count	6 years ago
shared	Fix form validation flash message color and input borders (#9235)	6 years ago
shares	Finalized theme loading and stuff	7 years ago
stream_entries	Display a double reply arrow on public pages for toots that are replies	6 years ago
tags	Merge branch 'master' into glitch-soc/merge	7 years ago
user_mailer	Remove links to bridge.joinmastodon.org (non-functional) (#9608)	6 years ago
well_known	Add remote interaction dialog for toots (#8202)	6 years ago