449 Commits

Author SHA1 Message Date
Thomas Waldmann
779b8a8f7b content for about page 2013-09-29 19:15:38 +02:00
Arne Schauf
320ae9a420 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 18:16:18 +02:00
Arne Schauf
13511a7982 fqdn fix 2013-09-29 18:15:15 +02:00
Thomas Waldmann
ff040cf715 use shorter hostnames without "www.":
nsupdate.info == ipv4 and v6
ipv4.nsupdate.info = only ipv4
ipv6.nsupdate.info = only ipv6
2013-09-29 17:57:56 +02:00
Fabian Faessler
43ec24bcf8 typo in model 2013-09-29 17:45:50 +02:00
Fabian Faessler
8e66e702f7 added get_fqdn() method to Host model. added post_save signal to delete dns entry when Host object is deleted 2013-09-29 17:43:17 +02:00
Arne Schauf
2aff509334 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 17:30:53 +02:00
Arne Schauf
5ff91162dd legal notice and css fixes 2013-09-29 17:28:36 +02:00
Thomas Waldmann
074233430c dnstools: implement additional functions: add and delete, with tests. 2013-09-29 17:21:22 +02:00
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
Arne Schauf
cb53af87e7 about page 2013-09-29 17:06:39 +02:00
Fabian Faessler
762f9e2802 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 16:58:06 +02:00
Fabian Faessler
d8f42c1fb1 added help and about view 2013-09-29 16:58:02 +02:00
Arne Schauf
edc888419d eyecandy for the registration form 2013-09-29 16:40:13 +02:00
Arne Schauf
3413043fb9 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 16:39:17 +02:00
Arne Schauf
9d6fd1afe3 registration link in nav 2013-09-29 16:39:03 +02:00
Fabian Faessler
b568682501 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 16:38:34 +02:00
Fabian Faessler
3f3e142aa0 added optional attribut to user field in domain model 2013-09-29 16:38:30 +02:00
Arne Schauf
d7e02ed95c link fixing (leave me alone, i18n) 2013-09-29 16:26:31 +02:00
Arne Schauf
7d49c1a40c Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 16:21:55 +02:00
Arne Schauf
41a4a2b357 links now working 2013-09-29 16:21:23 +02:00
Thomas Waldmann
fb76785bb6 more docstrings fixes 2013-09-29 16:15:12 +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
d935979934 add docstrings 2013-09-29 15:59:16 +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
Thomas Waldmann
64423caea4 fix redeclared STATIC_ROOT 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
1809737ae3 half broken commit to debug sth live. sorry 2013-09-29 15:09:53 +02:00
Fabian Faessler
fc2e088ba1 debug ip detection problem 2013-09-29 14:41:47 +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
8e705d5544 Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-29 03:44:20 +02:00