mastodon/app/views
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +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-10-10 17:26:08 +02:00
admin_mailer Fixed not being able to display review pending hashtags in the admin UI. (#11875) 2019-09-17 16:59:16 +02:00
application Remove fallback to long description on sidebar and meta description (#12119) 2019-10-08 22:08:55 +02:00
auth Add (back) option to set redirect notice on account without moving followers (#11994) 2019-09-29 05:03:19 +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-09-05 11:36:41 +02:00
errors Fix uncaught parameter missing exceptions and missing error templates (#11702) 2019-08-30 01:34:47 +02:00
filters Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
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 Remove invite comments from UI (#12068) 2019-10-03 22:37:13 +02:00
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
media
notification_mailer Fix NotificationMailer failing when receiving mention with media from remote instance (#11765) 2019-09-05 06:14:30 +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 Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
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-09-30 12:23:57 +02:00
shared Remove fallback to long description on sidebar and meta description (#12119) 2019-10-08 22:08:55 +02:00
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-10-10 17:26:08 +02:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
user_mailer Add password challenge to 2FA settings, e-mail notifications (#11878) 2019-09-18 16:37:27 +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