30 Commits

Author SHA1 Message Date
Fabian Faessler
155b1966d5 Merge branch 'master' of github.com:asmaps/nsupdate.info
Conflicts:
	nsupdate/nsupdate/templates/base.html
2013-09-28 23:14:47 +02:00
Arne Schauf
202de726c1 messages 2013-09-28 23:03:34 +02:00
Fabian Faessler
8d0ec17c6d added awesome front page 2013-09-28 22:56:59 +02:00
Arne Schauf
eb8f548f95 overview as class based view 2013-09-28 22:46:53 +02:00
Arne Schauf
3af1d10014 oups - pushed broken things 2013-09-28 22:22:42 +02:00
Arne Schauf
cddda9b6c0 Merge branch 'master' of github.com:asmaps/nsupdate.info
Conflicts:
	nsupdate/main/views.py
2013-09-28 22:22:11 +02:00
Arne Schauf
f43c71960f better imports 2013-09-28 22:20:19 +02:00
Fabian Faessler
e68aa8cc5f added host view. with broken edit. will be changed to classbased views 2013-09-28 22:17:24 +02:00
Fabian Faessler
faabb97463 added @login_requeired for the overview form 2013-09-28 21:38:02 +02:00
Fabian Faessler
99a3347042 host list and create new host form 2013-09-28 21:32:29 +02:00
Fabian Faessler
a96c7b4608 imrpoved ipv4/ipv6 check. now always update ip, in case host changes IP. added a create_host() method for the HostForm. 2013-09-28 20:18:20 +02:00
Fabian Faessler
8775295c9a removed stupid copy mistake 2013-09-28 20:02:58 +02:00
Fabian Faessler
eb30914704 added comment field in host. added admin and forms. 2013-09-28 20:01:09 +02:00
Fabian Faessler
04602c53a6 get ipv4 and ipv6 adr from session 2013-09-28 19:01:40 +02:00
Fabian Faessler
366f809e7f moved the /myip call into the api module 2013-09-28 18:46:31 +02:00
Fabian Faessler
abf2990db2 changed /myip response to plain text not json 2013-09-28 17:48:15 +02:00
Arne Schauf
ec2b8ab88a split up into new app accounts 2013-09-28 17:17:15 +02:00
Arne Schauf
9be82a5d01 Merge branch 'master' of github.com:asmaps/nsupdate.info
Conflicts:
	nsupdate/main/views.py
2013-09-28 16:56:53 +02:00
Arne Schauf
0025754447 refactoring 2013-09-28 16:56:01 +02:00
Fabian Faessler
fdf6b2c9d4 Merge branch 'master' of github.com:asmaps/nsupdate.info
Conflicts:
	nsupdate/main/views.py
2013-09-28 16:51:25 +02:00
Fabian Faessler
87767dc2e2 pep8 stuff 2013-09-28 16:50:13 +02:00
Arne Schauf
8f9bd085bd Merge branch 'master' of github.com:asmaps/nsupdate.info 2013-09-28 16:47:54 +02:00
Arne Schauf
0fc70cc61e profile and password change. 2013-09-28 16:46:33 +02:00
Fabian Faessler
a2a5f8e7f8 used the url from the settings for the ajax request 2013-09-28 16:25:19 +02:00
Fabian Faessler
62baa5f6a8 moved template in correct path 2013-09-28 14:26:00 +02:00
Fabian Faessler
d5bbc8ac59 added javascript example for /myip and added a view OverviewView. JS fails for dev server, because of the Access-Control-Allow-Origin 2013-09-28 13:56:54 +02:00
Fabian Faessler
9800d12812 changed tabs to spaces 2013-09-28 13:14:11 +02:00
Fabian Faessler
a4a183f702 added URL and simple view to get the user IP in a json format {'ip': '127.0.0.1'} 2013-09-28 13:04:21 +02:00
Arne Schauf
0d628f35e0 improved nav 2013-09-28 12:06:26 +02:00
Arne Schauf
931dde79bb requirements fix and basic django project 2013-09-28 10:44:29 +02:00