Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
0fba9e88
Unverified
Commit
0fba9e88
authored
Jun 30, 2016
by
Thom Wiggers
📐
Browse files
rearrange, include login template
parent
f92c7574
Changes
21
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
0fba9e88
...
...
@@ -5,7 +5,6 @@
.pydevproject
.project
.settings
/tourtodo/settings/site.py
.idea/
.tox/
db.sqlite3
...
...
tox.ini
0 → 100644
View file @
0fba9e88
[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
.
locale/nl/LC_MESSAGES/django.mo
→
website/
locale/nl/LC_MESSAGES/django.mo
View file @
0fba9e88
File moved
locale/nl/LC_MESSAGES/django.po
→
website/
locale/nl/LC_MESSAGES/django.po
View file @
0fba9e88
File moved
manage.py
→
website/
manage.py
View file @
0fba9e88
#!/usr/bin/env python
# flake8: noqa
import
os
import
sys
...
...
members/__init__.py
→
website/
members/__init__.py
View file @
0fba9e88
File moved
members/admin.py
→
website/
members/admin.py
View file @
0fba9e88
File moved
members/apps.py
→
website/
members/apps.py
View file @
0fba9e88
File moved
website/members/migrations/0001_initial.py
0 → 100644
View file @
0fba9e88
# -*- 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
)),
],
),
]
members/migrations/__init__.py
→
website/
members/migrations/__init__.py
View file @
0fba9e88
File moved
members/models.py
→
website/
members/models.py
View file @
0fba9e88
File moved
members/templates/members/index.html
→
website/
members/templates/members/index.html
View file @
0fba9e88
File moved
members/tests.py
→
website/
members/tests.py
View file @
0fba9e88
File moved
members/urls.py
→
website/
members/urls.py
View file @
0fba9e88
File moved
members/views.py
→
website/
members/views.py
View file @
0fba9e88
File moved
templates/README.md
→
website/
templates/README.md
View file @
0fba9e88
File moved
templates/registration/login.html
→
website/
templates/registration/login.html
View file @
0fba9e88
File moved
thaliawebsite/__init__.py
→
website/
thaliawebsite/__init__.py
View file @
0fba9e88
File moved
thaliawebsite/settings.py
→
website/
thaliawebsite/settings.py
View file @
0fba9e88
File moved
thaliawebsite/urls.py
→
website/
thaliawebsite/urls.py
View file @
0fba9e88
File moved
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment