Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes

2018-05-27 13:20:15 +02:00

..

blacklisted_email_validator.rb

Implement EmailBlackList (#5109)

2017-10-04 15:16:10 +02:00

disallowed_hashtags_validator.rb

Implement the ability for instances to define a list of disallowed hashtags (#7176)

2018-04-23 23:52:58 +02:00

email_mx_validator.rb

Validate that e-mail resolves with MX and it's not blacklisted (#7631)

2018-05-27 11:58:08 +09:00

status_length_validator.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-04 16:36:19 -06:00

status_pin_validator.rb

Allow more than the max pins if account is not local (#7105)

2018-04-12 20:36:02 +02:00

unique_username_validator.rb

Fix UniqueUsernameValidator comparison (#6926)

2018-03-27 04:33:57 +02:00

unreserved_username_validator.rb

pam authentication (#5303)

2018-02-02 10:18:55 +01:00

url_validator.rb

Punycode URI normalization (#2370)

2017-04-25 02:47:31 +02:00