mastodon/app/views
David Yip 77a92d3260
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
 	Gemfile.lock
2018-05-04 09:42:31 -05:00
..
about Merge remote-tracking branch 'origin/master' into gs-master 2018-04-18 18:48:12 -05:00
accounts Merge remote-tracking branch 'origin/master' into gs-master 2018-04-18 18:48:12 -05:00
admin Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-04 09:42:31 -05:00
admin_mailer Show remote reports in admin UI as coming from domain rather than user (#7347) 2018-05-04 13:26:25 +02:00
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 Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
invites Able to deactivate invites if they aren't expired (#7163) 2018-04-17 13:52:08 +02: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 gs-master 2018-04-14 09:12:50 -05:00
shared
shares
stream_entries Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -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 Serialize webfinger XML with Ox instead of Nokogiri (#7319) 2018-05-02 22:28:46 +02:00