This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views
David Yip 3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
	Gemfile
	config/locales/simple_form.pl.yml
2018-02-17 00:02:37 -06:00
..
about Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
accounts Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-08 10:17:15 +00:00
admin Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
admin_mailer Make salutation of email localizable (#4454) 2017-07-31 00:18:44 +02:00
application
auth Fix password recovery (#6459) 2018-02-10 17:09:44 +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
following_accounts
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 remote-tracking branch 'origin/master' into merge-upstream 2018-01-28 22:45:17 -06: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
settings Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -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 'tootsuite/master' into merge-upstream 2018-02-17 00:02:37 -06:00
tags Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2017-12-12 02:54:13 -06:00
user_mailer Improve HTML e-mails based on Litmus tests (#6301) 2018-01-20 01:32:21 +01:00
well_known Remove rabl dependency (#5894) 2017-12-06 15:04:49 +09:00