Merge branch 'release' into develop

2018-01-30 18:56:25 +01:00
parent 4fe6c8db64 1f1459b0d8
commit 9488ec2eb0
58 changed files with 260 additions and 134 deletions
@@ -23,6 +23,7 @@
            .strike
              span {{$t('or')}}
            .form(@keyup.enter="register()")
+              p.form-text {{$t('usernameLimitations')}}
              input.form-control(type='text', placeholder='Login Name', v-model='username', :class='{"input-valid": username.length > 3}')
              input.form-control(type='email', placeholder='Email', v-model='email', :class='{"input-invalid": emailInvalid, "input-valid": emailValid}')
              input.form-control(type='password', placeholder='Password', v-model='password', :class='{"input-valid": password.length > 3}')