Arne Schauf 3fb3524106 Merge branch 'master' of github.com:asmaps/nsupdate.info ...

Conflicts:
	nsupdate/main/templates/main/about.html
	nsupdate/main/urls.py
	nsupdate/nsupdate/templates/base.html

2013-09-29 17:12:32 +02:00

..

_tests

cleanup settings access

2013-09-28 22:04:52 +02:00

migrations

Merge branch 'master' of github.com:asmaps/nsupdate.info

2013-09-29 14:33:58 +02:00

templates/main

Merge branch 'master' of github.com:asmaps/nsupdate.info

2013-09-29 17:12:32 +02:00

__init__.py

requirements fix and basic django project

2013-09-28 10:44:29 +02:00

admin.py

added domain blacklisting

2013-09-29 14:10:14 +02:00

dnstools.py

added docstring

2013-09-29 02:00:15 +02:00

forms.py

divided subdomain and domain (as FK)

2013-09-29 13:36:28 +02:00

models.py

added optional attribut to user field in domain model

2013-09-29 16:38:30 +02:00

urls.py

Merge branch 'master' of github.com:asmaps/nsupdate.info

2013-09-29 17:12:32 +02:00

views.py

Merge branch 'master' of github.com:asmaps/nsupdate.info

2013-09-29 17:12:32 +02:00