diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-05-23 14:39:47 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-05-23 14:39:47 -0300 |
| commit | 19140b9b1959218c1d6bbfec105a1d62125c2635 (patch) | |
| tree | 53bfb94e240cbcb68fbccf16d62566400204d1e5 | |
| parent | bafcfbbfb571f537c0c621f6ea0eba7e183522a2 (diff) | |
| parent | 8b2a0b62bab158417babd0182d4dc00adf8ec521 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/allow-usernames-ending-with-digit' into develop
| -rw-r--r-- | changes/bug_allow-usernames-ending-with-digit | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/util/credentials.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/bug_allow-usernames-ending-with-digit b/changes/bug_allow-usernames-ending-with-digit new file mode 100644 index 00000000..de47e7ac --- /dev/null +++ b/changes/bug_allow-usernames-ending-with-digit @@ -0,0 +1 @@ +- Allow usernames to end in a digit. diff --git a/src/leap/bitmask/util/credentials.py b/src/leap/bitmask/util/credentials.py index a661bfb0..07ded17b 100644 --- a/src/leap/bitmask/util/credentials.py +++ b/src/leap/bitmask/util/credentials.py @@ -21,7 +21,7 @@ Credentials utilities from PySide import QtCore, QtGui WEAK_PASSWORDS = ("123456", "qweasd", "qwerty", "password") -USERNAME_REGEX = r"^[A-Za-z][A-Za-z\d_\-\.]+[A-Za-z]$" +USERNAME_REGEX = r"^[A-Za-z][A-Za-z\d_\-\.]+[A-Za-z\d]$" USERNAME_VALIDATOR = QtGui.QRegExpValidator(QtCore.QRegExp(USERNAME_REGEX)) |