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 dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
2020-01-20 18:31:11 +01:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-11-23 19:03:01 +01:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01: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 Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +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
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 Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
follower_accounts
following_accounts
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/master 2020-01-20 15:00:22 +01: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 Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00
public_timelines Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
relationships Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
remote_follow
remote_interaction
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01: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/master 2020-01-20 15:00:22 +01: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