Thomas Waldmann ba977193ce Merge branch 'master' into py3-port ...

Conflicts:
	nsupdate/main/_tests/test_main.py

2013-12-24 21:31:40 +01:00

..

_tests

Merge branch 'master' into py3-port

2013-12-24 21:31:40 +01:00

migrations

add available, abuse and abuse_blocked flags to Host, show on UI, script to reset flags

2013-11-30 12:32:03 +01:00

templates/main

js update client: add verbose messages, but also display the original result code

2013-12-16 00:15:51 +01:00

__init__.py

requirements fix and basic django project

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

admin.py

add/fix some module-level docstrings

2013-12-15 17:09:22 +01:00

dnstools.py

dnstools: reviewed/improved docstrings

2013-12-15 18:44:33 +01:00

forms.py

add/fix some module-level docstrings

2013-12-15 17:09:22 +01:00

models.py

Merge branch 'master' into py3-port

2013-12-24 21:31:40 +01:00

urls.py

add/fix some module-level docstrings

2013-12-15 17:09:22 +01:00

views.py

Merge branch 'master' into py3-port

2013-12-24 21:31:40 +01:00