Commit 5486fe2c authored by Oliver Falk's avatar Oliver Falk

Merge branch 'devel' into 'master'

Marge latest devel into master

See merge request !141
parents 02aba96a f86c9bae
Pipeline #1467 passed with stage
in 11 minutes and 28 seconds
image: ofalk/centos7-python36
image: docker.io/ofalk/fedora28-python3
before_script:
- virtualenv -p python3.6 /tmp/.virtualenv
- virtualenv-3 -p python3 /tmp/.virtualenv
- source /tmp/.virtualenv/bin/activate
- pip install Pillow
- pip install -r requirements.txt
......
......@@ -28,13 +28,13 @@
<div class="form-group">
<div class="checkbox">
<input type="checkbox" name="not_porn" required id="id_not_porn">
<label for="id_not_porn">{% trans 'suitable for all ages (i.e. no offensive content)' %}</label>
<label for="id_not_porn"><b>{% trans 'required' %}</b>; {% trans 'suitable for all ages (i.e. no offensive content)' %}</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" name="can_distribute" required id="id_can_distribute">
<label for="id_can_distribute">{% trans 'can be freely copied' %}</label>
<label for="id_can_distribute"><b>{% trans 'required' %}</b>; {% trans 'can be freely copied' %}</label>
</div>
</div>
<button type="submit" class="btn btn-default">{% trans 'Upload' %}</button>
......
......@@ -918,7 +918,7 @@ class PasswordResetView(PasswordResetViewOriginal):
try:
confirmed_email = ConfirmedEmail.objects.get(email=request.POST['email'])
confirmed_email.user.email = confirmed_email.email
if not confirmed_email.user.password:
if not confirmed_email.user.password or confirmed_email.user.password == '!':
random_pass = User.objects.make_random_password()
confirmed_email.user.set_pasword(random_pass)
confirmed_email.user.save()
......
......@@ -30,7 +30,7 @@ wheel
yapf
django-anymail[mailgun]
mysqlclient
psycopg2
psycopg2-binary
notsetuptools
git+https://github.com/ofalk/monsterid.git
git+https://github.com/ofalk/Robohash.git@devel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment