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 83dc54c487 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.		4 years ago
..
blacklisted_email_validator.rb	Fix “invited by” not showing up for invited accounts in admin interface (#10791)	6 years ago
disallowed_hashtags_validator.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
domain_validator.rb	Fix uncaught domain normalization error in remote follow (#11703)	5 years ago
ed25519_key_validator.rb	Add E2EE API (#13820)	5 years ago
ed25519_signature_validator.rb	Add E2EE API (#13820)	5 years ago
email_mx_validator.rb	Fix encoding error when checking e-mail MX records (#11696)	5 years ago
existing_username_validator.rb	Fix admin validation being too strict about usernames (#10449)	6 years ago
follow_limit_validator.rb	Fix follow limit validator reporting lower number past threshold (#9230)	6 years ago
html_validator.rb	Change HTML validator to ignore all errors except unmatched tags (#10534)	6 years ago
note_length_validator.rb	Change note length validation to ignore mention domains and URLs (#9717)	6 years ago
poll_validator.rb	Improve polls: option lengths & redesign (#13257)	5 years ago
reaction_validator.rb	Fix validations of reactions limit (#12955)	5 years ago
status_length_validator.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
status_pin_validator.rb	changed pinned status count operator	6 years ago
unique_username_validator.rb	Search account domain in lowercase (#13016)	5 years ago
unreserved_username_validator.rb	Add specs for UnreservedUsernameValidator (#9698)	6 years ago
url_validator.rb	Change note length validation to ignore mention domains and URLs (#9717)	6 years ago
vote_validator.rb	Fix invalid votes from the API being accepted (#12601)	5 years ago