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 |
|
Fabian Faessler
|
d454af649f
|
ip dns update button in HostView
|
2013-09-29 03:44:14 +02:00 |
|
Arne Schauf
|
3e87efa7e7
|
Merge branch 'master' of github.com:asmaps/nsupdate.info
|
2013-09-29 03:13:16 +02:00 |
|
Arne Schauf
|
7f71bf7565
|
piwik tracking
|
2013-09-29 03:13:04 +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
|
0a297b04ee
|
style fix: use with with open, os.path.join for pathes
|
2013-09-29 01:59:47 +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 |
|