Merge branch 'master' into phildenhoff/fix-at-sigil-in-localpart

diff --cc src/app/templates/auth/Auth.jsx
index a16206d6c3e43bbb80de1536bef28b6e19a39df8,cd287e299c74e3198b0a0a5776a31d3697d6f51c..d66617b81de65bc0a609ac85396b7b920d218245
--- 1/src/app/templates/auth/Auth.jsx
--- 2/src/app/templates/auth/Auth.jsx
+++ b/src/app/templates/auth/Auth.jsx
@@@ -13,12 -13,8 +13,12 @@@ import Spinner from '../../atoms/spinne
  
  import CinnySvg from '../../../../public/res/svg/cinny.svg';
  
 -const USERNAME_REGEX = /^[a-z0-9_\-.=/]+$/;
 -const BAD_USERNAME_ERROR = 'Username must contain only lowercase letters, numbers, dashes and underscores.';
 +// This regex validates historical usernames, which don't satisy today's username requirements.
 +// See https://matrix.org/docs/spec/appendices#id13 for more info.
 +const LOCALPART_LOGIN_REGEX = /^[!-9|;-~]+$/;
- const LOCALPART_SIGNUP_REGEX = /^[a-z0-9_\-+./]+$/;
- const BAD_LOCALPART_ERROR = 'Username must contain only lowercase letters, numbers, dashes and underscores.';
++const LOCALPART_SIGNUP_REGEX = /^[a-z0-9_\-.=/]+$/;
++const BAD_LOCALPART_ERROR = 'Username must contain only a-z, 0-9, ., _, =, -, and /.';
 +const USER_ID_TOO_LONG_ERROR = 'Your user ID, including the hostname, can\'t be more than 255 characters long.';
  
  const PASSWORD_REGEX = /.+/;
  const PASSWORD_STRENGHT_REGEX = /^(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[^\w\d\s:])([^\s]){8,16}$/;