Commit fbb099d4 authored by Oliver Falk's avatar Oliver Falk
Browse files

Merge branch 'devel' into 'master'

Adapt to new Django and update contact page

See merge request !185
parents 0f60e20d d9f4a4f6
Pipeline #2145 passed with stages
in 10 minutes and 49 seconds
......@@ -23,6 +23,7 @@ cd ivatar
virtualenv -p python3 .virtualenv
source .virtualenv/bin/activate
pip install -r requirements.txt
pip install pillow
~~~~
## (SQL) Migrations
......
# Generated by Django 3.2.3 on 2021-05-28 13:14
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('ivataraccount', '0016_auto_20210413_0904'),
]
operations = [
migrations.AlterField(
model_name='confirmedemail',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='confirmedopenid',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='openidassociation',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='openidnonce',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='photo',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='unconfirmedemail',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
migrations.AlterField(
model_name='unconfirmedopenid',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
),
]
......@@ -118,4 +118,6 @@ PROJECT_ROOT = os.path.abspath(
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
from config import * # pylint: disable=wildcard-import,wrong-import-position,unused-wildcard-import
......@@ -14,9 +14,7 @@
There are a few ways to get in touch with the ivatar/libravatar developers:
<h4 style="margin-top: 2rem;margin-bottom: 1rem;">IRC</h4>
If you have an IRC client already, you can join #libravatar on chat.freenode.net.
<br/>
Otherwise, you can use this <a href="http://webchat.freenode.net/?channels=libravatar" title="http://webchat.freenode.net/?channels=libravatar">simple web interface</a>.
You can join the Libravatar community chat at <a href="https://matrix.to/#/#libravatar:matrix.org?via=shivering-isles.com&via=matrix.org&via=foad.me.uk" title="Libravatar on Matrix">#libravatar:matrix.org</a>. It is also bridged to #libravatar on irc.<a href="https://libera.chat/">libera.chat</a> for those prefering IRC.
<br/>
Please keep in mind that you may live in a different timezone than most of the developers. So if you do not get a response, it's not because we're ignoring you, it's probably because we're sleeping :)
......
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