glitchier-soc

History

Claire 09306d7c3c Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.		3 years ago
..
about	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
accounts	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin_mailer	Add trending statuses (#17431 )	3 years ago
application	Add trending statuses (#17431 )	3 years ago
auth	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
authorize_interactions	Fix misleading error when attempting to re-send a pending follow request (#13133 )	5 years ago
directories	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
disputes/strikes	Change old moderation strikes to be displayed in a separate page (#17566 )	3 years ago
errors	Add specific rate limits for posting and following (#13172 )	5 years ago
filters	Fix not being able to change world filter expiration back to “Never” (#15858 )	4 years ago
follower_accounts	Add `/api/v1/accounts/familiar_followers` to REST API (#17700 )	3 years ago
following_accounts	Add `/api/v1/accounts/familiar_followers` to REST API (#17700 )	3 years ago
home	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
invites	Remove invite comments from UI (#12068 )	5 years ago
kaminari	Pagination improvements (#1445 )	8 years ago
layouts	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
media	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
notification_mailer	Add notifications for statuses deleted by moderators (#17204 )	3 years ago
oauth	Change visual separation of applications in authorized apps list (#17686 )	3 years ago
public_timelines	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
relationships	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
remote_follow	Admission-based registrations mode (#10250 )	6 years ago
remote_interaction	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247 )	5 years ago
settings	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
shared	Add honeypot fields and minimum fill-out time for sign-up form (#15276 )	4 years ago
shares	Add subresource integrity for JS and CSS assets (#15096 )	4 years ago
statuses	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
statuses_cleanup	Add feature to automatically delete old toots (#16529 )	3 years ago
tags	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
user_mailer	Add appeals (#17364 )	3 years ago
well_known/host_meta	Remove dependency on goldfinger gem (#14919 )	4 years ago