David Yip 1b8fcd4df5 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml		2018-03-02 21:46:44 -06:00
..
about	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
accounts	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
admin	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
admin_mailer	Make salutation of email localizable (#4454)	2017-07-31 00:18:44 +02:00
application	Added haml-lint and fix warnings (#2773)	2017-05-08 03:35:25 +02:00
auth	Fix #942: Seamless LDAP login (#6556)	2018-02-28 19:04:53 +01:00
authorize_follows	Resolve URL for local account in follow authorization success view (#6324)	2018-01-22 14:22:14 +01:00
errors	New error page graphic. Other error page improvements (#5099)	2017-09-25 23:05:54 +02:00
follower_accounts	Add option to opt out of search engines on public profile/status pages (#4199)	2017-07-14 16:41:02 +02:00
following_accounts	Add option to opt out of search engines on public profile/status pages (#4199)	2017-07-14 16:41:02 +02:00
home	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
invites	Fix invites form path (#5861)	2017-12-01 12:26:57 +01:00
kaminari
layouts	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
media	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
notification_mailer	Add direction tags to HTML e-mails for RTL languages (#6373)	2018-01-29 00:22:20 +01:00
oauth	Oauth code in input form and add description message (#4986)	2017-09-17 15:23:44 +02:00
remote_follow	Fix remote follow (#2547)	2017-04-28 00:16:44 +02:00
settings	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
shared	fix presented og:url is incorrect (#5320)	2017-10-11 19:22:21 +02:00
shares	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
stream_entries	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
tags	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
user_mailer	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
well_known	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00