Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

blacklisted_email_validator.rb

Fix “invited by” not showing up for invited accounts in admin interface (#10791)

2019-05-19 21:40:36 +02:00

disallowed_hashtags_validator.rb

Change admin UI for hashtags and add back whitelisted trends (#11490)

2019-08-05 19:54:29 +02:00

domain_validator.rb

Fix uncaught domain normalization error in remote follow (#11703)

2019-08-30 02:19:17 +02:00

email_mx_validator.rb

Fix encoding error when checking e-mail MX records (#11696)

2019-08-30 01:35:12 +02:00

existing_username_validator.rb

…

follow_limit_validator.rb

…

html_validator.rb

…

note_length_validator.rb

…

poll_validator.rb

Increase poll option length limit to 100 chars, number of options to 5

2019-10-10 20:13:59 +02:00

reaction_validator.rb

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

status_length_validator.rb

…

status_pin_validator.rb

changed pinned status count operator

2019-04-29 20:52:53 +02:00

unique_username_validator.rb

Don't delete periods when validating username uniqueness (#11392) (#11400)

2019-07-24 14:19:17 +02:00

unreserved_username_validator.rb

…

url_validator.rb

…

vote_validator.rb

Fix invalid votes from the API being accepted (#12601)

2020-01-12 14:17:03 +01:00