mastodon/app/views
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +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 2020-02-06 21:36:38 +01:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +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 Fix invite request input not being shown on sign-up error if left empty (#13089) 2020-02-16 12:38:22 +01:00
authorize_interactions Fix misleading error when attempting to re-send a pending follow request (#13133) 2020-02-24 21:19:19 +01:00
directories Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
errors Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
filters Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01: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/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-27 15:46:50 +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 2020-03-08 19:38:53 +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/merge-upstream 2020-02-06 21:36:38 +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 Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00