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
Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream
- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.
2021-05-07 18:21:59 +02:00
..
about Merge branch 'main' into glitch-soc/merge-upstream 2021-03-02 12:06:58 +01:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
admin_mailer
application
auth Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
authorize_interactions
directories
errors
filters Fix not being able to change world filter expiration back to “Never” (#15858) 2021-03-12 05:25:50 +01:00
follower_accounts
following_accounts
home Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
invites
kaminari
layouts Merge branch 'main' into glitch-soc/merge-upstream 2021-04-05 14:31:07 +02:00
media Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
notification_mailer Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573) 2020-12-15 12:56:43 +01:00
oauth Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
public_timelines Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
relationships Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
remote_follow
remote_interaction
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-03-15 11:26:59 +01:00
shared Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
shares Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
user_mailer Fix missing source strings and inconsistent lead text style in admin UI (#16052) 2021-04-17 11:12:49 +02:00
well_known/host_meta Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00