mastodon/app/views
David Yip a817f084ea
Merge remote-tracking branch 'tootsuite/master'
Conflicts:
 	app/controllers/statuses_controller.rb
2018-04-12 03:30:57 -05:00
..
about Merge remote-tracking branch 'origin/master' into gs-master 2018-04-04 13:56:58 -05:00
accounts Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
admin Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-04-11 00:50:09 +00:00
admin_mailer
application
auth Add headings to the security settings page (#6661) 2018-03-07 01:39:40 +01:00
authorize_follows Note if the user is already following the target when authorizing follow (#6325) 2018-03-24 12:50:41 +01:00
errors
follower_accounts Add missing meta description to profiles, some other SEO stuff (#6706) 2018-03-09 00:35:07 +01:00
following_accounts Add missing meta description to profiles, some other SEO stuff (#6706) 2018-03-09 00:35:07 +01:00
home
invites Invites: Add '1 week' as expire option (#6872) 2018-03-24 12:50:14 +01:00
kaminari
layouts Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-11 09:17:21 +00:00
media Save video metadata and improve video OpenGraph tags (#6481) 2018-02-16 07:22:20 +01:00
notification_mailer Display content warning in mail notification emails (#6832) 2018-03-19 20:12:20 +01:00
oauth
remote_follow
remote_unfollows Fix follow/unfollow buttons on public profile (fixes #7036) (#7040) 2018-04-08 13:40:22 +02:00
settings Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
shared
shares
stream_entries Merge remote-tracking branch 'tootsuite/master' 2018-04-12 03:30:57 -05:00
tags Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
user_mailer Fix e-mail changed notification (fixes #6778) (#6835) 2018-03-19 20:07:47 +01:00
well_known