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.

Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		5 years ago
..
exports	…
migration	Fix account redirect confirmation message talking about moved followers (#13950)	5 years ago
preferences	…
two_factor_authentication	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
aliases_controller.rb	Addition of update activity distribution by alias, minor correction (#11905)	5 years ago
applications_controller.rb	…
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
deletes_controller.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
exports_controller.rb	Add account migration UI (#11846)	5 years ago
featured_tags_controller.rb	…
flavours_controller.rb	…
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
imports_controller.rb	Fix ImportsController param to permit :mode (#13347)	5 years ago
migrations_controller.rb	Fix account migration not affecting followers on origin server (#11980)	5 years ago
pictures_controller.rb	Allow users to delete their header and avatar (#13234)	5 years ago
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
profiles_controller.rb	Fix base64-encoded file uploads not being possible (#12748)	5 years ago
sessions_controller.rb	…
two_factor_authentications_controller.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago