mastodon/app/views
Thibaut Girka 741b53651e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
2019-08-30 13:38:41 +02:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
admin_mailer Change admin UI for hashtags and add back whitelisted trends (#11490) 2019-08-05 19:54:29 +02:00
application Add profile directory to web UI (#11688) 2019-08-30 00:14:36 +02:00
auth Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
authorize_interactions Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 2019-07-07 16:16:51 +02:00
directories Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
errors Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00
filters
follower_accounts Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
following_accounts Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
home Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
invites Add invite comments (#10465) 2019-08-19 11:40:42 +02:00
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
media
notification_mailer Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
oauth Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00
public_timelines Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
relationships Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
remote_follow
remote_interaction Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 2019-07-07 16:16:51 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
shared
shares Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
statuses Merge branch 'master' into glitch-soc/merge-upstream 2019-08-29 12:07:50 +02:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
user_mailer Fix error in warning e-mail template (#11698) 2019-08-30 01:34:59 +02:00
well_known/host_meta Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00