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.

David Yip 77a92d3260 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: Gemfile.lock		6 years ago
..
about	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
accounts	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
admin	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
admin_mailer	Show remote reports in admin UI as coming from domain rather than user (#7347)	6 years ago
application	Added haml-lint and fix warnings (#2773)	7 years ago
auth	Add headings to the security settings page (#6661)	6 years ago
authorize_follows	Note if the user is already following the target when authorizing follow (#6325)	6 years ago
errors	New error page graphic. Other error page improvements (#5099)	7 years ago
follower_accounts	Add missing meta description to profiles, some other SEO stuff (#6706)	6 years ago
following_accounts	Add missing meta description to profiles, some other SEO stuff (#6706)	6 years ago
home	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
invites	Able to deactivate invites if they aren't expired (#7163)	6 years ago
kaminari	Pagination improvements (#1445)	7 years ago
layouts	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago
media	Save video metadata and improve video OpenGraph tags (#6481)	6 years ago
notification_mailer	Display content warning in mail notification emails (#6832)	6 years ago
oauth	Oauth code in input form and add description message (#4986)	7 years ago
remote_follow	Fix remote follow (#2547)	7 years ago
remote_unfollows	Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)	6 years ago
settings	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
shared	fix presented og:url is incorrect (#5320)	7 years ago
shares	Finalized theme loading and stuff	7 years ago
stream_entries	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
tags	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
user_mailer	Fix e-mail changed notification (fixes #6778) (#6835)	6 years ago
well_known	Serialize webfinger XML with Ox instead of Nokogiri (#7319)	6 years ago