106 Commits

Author SHA1 Message Date
Fabian Faessler
3f3e142aa0 added optional attribut to user field in domain model 2013-09-29 16:38:30 +02:00
Arne Schauf
1abe15e9ab pep8 2013-09-29 16:12:19 +02:00
Arne Schauf
4d8a6a76a5 Merge branch 'master' of github.com:asmaps/nsupdate.info
Conflicts:
	nsupdate/main/models.py
	nsupdate/main/views.py
2013-09-29 16:07:33 +02:00
Arne Schauf
34a8bbe6b8 pep8 and so on 2013-09-29 16:03:56 +02:00
Thomas Waldmann
a3e7de3d6a fix wrong closing tag 2013-09-29 15:44:29 +02:00
Thomas Waldmann
15722a086a fix syntax errors / typos 2013-09-29 15:44:29 +02:00
Thomas Waldmann
28e17fdeb4 redundant parens, use tuple 2013-09-29 15:44:29 +02:00
Fabian Faessler
dcd78ac304 pep8 fixes 2013-09-29 15:37:58 +02:00
Fabian Faessler
536ff42e1e forgot to save session 2013-09-29 15:17:41 +02:00
Fabian Faessler
8c56bc9f19 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 15:15:40 +02:00
Fabian Faessler
6bcaf76263 fixed the ip detection :3 2013-09-29 15:15:34 +02:00
Thomas Waldmann
105315548a remove resolved TODO, the update_secret is hashed using django's "sha1" hasher (salted sha1) 2013-09-29 15:13:11 +02:00
Fabian Faessler
844f08137c merge conflict again in models.py 2013-09-29 14:36:29 +02:00
Fabian Faessler
2ffabb22b0 merge conflict in models.py 2013-09-29 14:35:37 +02:00
Fabian Faessler
e1c87a1f42 Merge branch 'master' of github.com:asmaps/nsupdate.info
Conflicts:
	nsupdate/main/models.py
2013-09-29 14:33:58 +02:00
Fabian Faessler
f25ed3cdee removed proxy user, because solution was not working. Made id session based. please work now :'( 2013-09-29 14:33:24 +02:00
Arne Schauf
f56b8a8376 actually added the validator and made created_by in blacklist optional 2013-09-29 14:21:23 +02:00
Arne Schauf
b60bd75509 added domain blacklisting 2013-09-29 14:10:14 +02:00
Arne Schauf
d44c8a7e90 made home template and added admin link to nav 2013-09-29 14:08:22 +02:00
Fabian Faessler
09da9a4036 changed User to ProxyUser 2013-09-29 14:07:24 +02:00
Fabian Faessler
5537a12c1b changed User to ProxyUser 2013-09-29 13:53:35 +02:00
Arne Schauf
6a8707e2c6 validator for subdomain 2013-09-29 13:47:02 +02:00
Arne Schauf
332acdf469 divided subdomain and domain (as FK) 2013-09-29 13:36:28 +02:00
Arne Schauf
b088c8e6c0 verbose for fqdn 2013-09-29 13:13:04 +02:00
Fabian Faessler
d454af649f ip dns update button in HostView 2013-09-29 03:44:14 +02:00
Fabian Faessler
2dfd6075c4 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 02:44:12 +02:00
Fabian Faessler
aa670e33ed some ui changes 2013-09-29 02:44:09 +02:00
Thomas Waldmann
adc6315a34 implemented authorized nic update view (via admin session) 2013-09-29 02:43:47 +02:00
Fabian Faessler
abe8ee41ff Merge branch 'master' of github.com:asmaps/nsupdate.info
Conflicts:
	nsupdate/main/urls.py
2013-09-29 02:08:39 +02:00
Fabian Faessler
374288d20a changed updateIp to detectIP 2013-09-29 02:07:58 +02:00
Thomas Waldmann
726a5696bd added docstring 2013-09-29 02:00:15 +02:00
Thomas Waldmann
26a911824d pep8 fixes 2013-09-29 01:29:01 +02:00
Fabian Faessler
2e0f02053f Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 01:26:47 +02:00
Fabian Faessler
ec6cfa7698 fixed css issue. accidentally used boostrap 2 and 3. I FOUND IT. NOT ASMAPS 2013-09-29 01:26:28 +02:00
Thomas Waldmann
ac4860f54a pep8 fixes 2013-09-29 01:23:27 +02:00
Fabian Faessler
0093aab667 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 01:18:36 +02:00
Fabian Faessler
80c91e6b4e new favicon 2013-09-29 01:18:28 +02:00
Arne Schauf
5d4aec123d quick fixes are dirty 2013-09-29 01:16:49 +02:00
Arne Schauf
b826ea803b Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 01:16:09 +02:00
Arne Schauf
8b95f4dd40 first test - then commit 2013-09-29 01:15:55 +02:00
Fabian Faessler
a9cca9071b Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 01:12:35 +02:00
Fabian Faessler
aabc5d78d6 updadd Host fields. serve 1px image instead of OK text in /updateip/. favicon change. 2013-09-29 01:12:23 +02:00
Arne Schauf
57e4ae3c26 minor fixes 2013-09-29 01:08:52 +02:00
Thomas Waldmann
d558e2ece2 store update_secret as salted sha1 (use crypto code from django), fix bug: we also need to catch NoAnswer, not just NXDOMAIN.
NoAnswer == there is a record, but not of the type (A or AAAA) we requested.
NXDOMAIN == there is no record at all.
2013-09-29 00:34:47 +02:00
Fabian Faessler
553e02f243 fixed different width in templates 2013-09-29 00:28:31 +02:00
Fabian Faessler
884c86defd added user check if he is allowed to edit a host 2013-09-28 23:54:37 +02:00
Fabian Faessler
d58e510a79 Merge branch 'master' of github.com:asmaps/nsupdate.info
Conflicts:
	nsupdate/main/views.py
2013-09-28 23:46:17 +02:00
Fabian Faessler
dd614d1936 changed the host edit into a classbased view. added host delete 2013-09-28 23:45:46 +02:00
Arne Schauf
a92e691161 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-28 23:31:53 +02:00
Arne Schauf
2b365a0496 moved create_context to context_processor 2013-09-28 23:31:33 +02:00