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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		7 years ago
..
blacklisted_email_validator.rb	Implement EmailBlackList (#5109)	7 years ago
disallowed_hashtags_validator.rb	Implement the ability for instances to define a list of disallowed hashtags (#7176)	7 years ago
email_mx_validator.rb	In e-mail validator, fallback from MX to A record (#7955)	7 years ago
status_length_validator.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
status_pin_validator.rb	Allow more than the max pins if account is not local (#7105)	7 years ago
unique_username_validator.rb	Fix UniqueUsernameValidator comparison (#6926)	7 years ago
unreserved_username_validator.rb	pam authentication (#5303)	7 years ago
url_validator.rb	Punycode URI normalization (#2370)	8 years ago