fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 15:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views
History
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -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 CAS + SAML authentication feature (#6425) 2018-02-04 05:42:13 +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 remote-tracking branch 'origin/master' into merge-upstream 2018-01-28 22:45:17 -06: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 'origin/master' into merge-upstream 2018-02-09 09:25:53 -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