This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +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-09-18 17:25:56 +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 Fix user preference to show trends not working on public pages (#11740) 2019-09-03 04:57:07 +02:00
auth Change account deletion page to have better explanations (#11753) 2019-09-04 04:13:54 +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
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 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-18 17:25:56 +02:00
shared Change OpenGraph description on sign-up page to reflect invite (#11744) 2019-09-03 04:56:54 +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-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 nil error in warning e-mail template (#11812) 2019-09-12 01:51:01 +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