Claire 0e74d4da59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.		2022-06-21 08:28:59 +02:00
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-21 08:28:59 +02:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
admin_mailer	Fix incorrect link in "new trending tags" email (#18156)	2022-04-28 17:15:29 +02:00
application	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
authorize_interactions	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
directories	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-28 16:22:28 +02:00
disputes/strikes	Fix ambiguous wording on appeal actions (#18328)	2022-05-06 21:41:34 +02:00
errors	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
filters	Fix not being able to change world filter expiration back to “Never” (#15858)	2021-03-12 05:25:50 +01:00
follower_accounts	Add /api/v1/accounts/familiar_followers to REST API (#17700)	2022-03-07 09:36:47 +01:00
following_accounts	Add /api/v1/accounts/familiar_followers to REST API (#17700)	2022-03-07 09:36:47 +01:00
home	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
invites	Remove invite comments from UI (#12068)	2019-10-03 22:37:13 +02:00
kaminari	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
media	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
notification_mailer	Refactor account and status formatting (#17877)	2022-03-28 01:17:17 +02:00
oauth	Change visual separation of applications in authorized apps list (#17686)	2022-03-02 20:28:25 +01:00
public_timelines	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02: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 'main' into glitch-soc/merge-upstream	2022-04-08 19:53:32 +02:00
shared	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02: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	2022-06-02 09:49:38 +02:00
statuses_cleanup	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-21 08:28:59 +02:00
user_mailer	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
well_known/host_meta	Remove dependency on goldfinger gem (#14919)	2020-10-08 00:34:57 +02:00