Unverified Commit 0fba9e88 authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

rearrange, include login template

parent f92c7574
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
.pydevproject .pydevproject
.project .project
.settings .settings
/tourtodo/settings/site.py
.idea/ .idea/
.tox/ .tox/
db.sqlite3 db.sqlite3
......
[tox]
envlist = flake8,py27,py34,py35
skipsdist = True
[testenv]
changedir={toxinidir}/website
commands =
python manage.py check
python -Wall manage.py test
deps = -r{toxinidir}/requirements.txt
[flake8]
exclude = */migrations/*, */urls.py
[testenv:flake8]
deps=flake8
skip_install=True
commands=
flake8 .
#!/usr/bin/env python #!/usr/bin/env python
# flake8: noqa
import os import os
import sys import sys
......
# -*- coding: utf-8 -*-
# Generated by Django 1.10b1 on 2016-06-29 22:49
from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
initial = True
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='Membership',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('membership_type', models.CharField(choices=[('benefactor', 'Benefactor'), ('member', 'Member'), ('honorary', 'Honorary Member')], max_length=40)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
]
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