You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 1fbd1fa5c4 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
..
exports	Add import/export feature for bookmarks (#14956)	4 years ago
migration	Refactor settings controllers (#14767)	4 years ago
preferences	Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)	6 years ago
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
aliases_controller.rb	Refactor settings controllers (#14767)	4 years ago
applications_controller.rb	Refactor settings controllers (#14767)	4 years ago
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
deletes_controller.rb	Fix user email address being banned on self-deletion (#16503)	3 years ago
exports_controller.rb	Refactor settings controllers (#14767)	4 years ago
featured_tags_controller.rb	Refactor settings controllers (#14767)	4 years ago
flavours_controller.rb	Revert some refactoring in order to make codebase closer to upstream	5 years ago
imports_controller.rb	Refactor settings controllers (#14767)	4 years ago
login_activities_controller.rb	Fix login date not showing up in login history by using “public” pack	3 years ago
migrations_controller.rb	Refactor settings controllers (#14767)	4 years ago
pictures_controller.rb	Fix profile update not being sent on profile/header picture deletion (#15461)	4 years ago
preferences_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
profiles_controller.rb	Add `/api/v1/accounts/familiar_followers` to REST API (#17700)	3 years ago
sessions_controller.rb	Refactor settings controllers (#14767)	4 years ago
two_factor_authentication_methods_controller.rb	Refactor settings controllers (#14767)	4 years ago