Merge branch 'master' into ipset

micolous · Oct 27, 2012 · 6beeb1d · 6beeb1d
2 parents cb14027 + 31fccdd
commit 6beeb1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/tollgate/frontend/views.py b/tollgate/frontend/views.py
@@ -850,7 +850,7 @@ def usage_disable(request, aid):
 def pclist(request):
 	hosts = NetworkHost.objects.exclude(
 		user_profile__exact=None
-	).order_by('ip_address')
+	).order_by('user_profile__user__username')
 
 	return render_to_response('frontend/pclist.html', {
 		'hosts': hosts,
@@ -862,7 +862,7 @@ def pclist(request):
 def pclist_unowned(request):
 	hosts = NetworkHost.objects.filter(
 		user_profile__exact=None
-	).order_by('ip_address')
+	).order_by('user_profile__user__username')
 
 	return render_to_response('frontend/pclist.html', {
 		'hosts': hosts,

diff --git a/tollgate/scripts/management/commands/scraper.dat b/tollgate/scripts/management/commands/scraper.dat
@@ -106,6 +106,15 @@ quanta = ^quanta
 seagate = ^seagate
 telco = ^telco systems
 zyxel = ^zyxel
+vivotek = ^vivotek
+areca = ^areca
+virtualbox = ^cadmus computer systems
+azurewave = ^azurewave tech
+raspberrypi = ^raspberry pi
+sparklan = ^sparklan communications
+clipsal = ^clipsal
+
+
 
 [oui-console]
 ; could this be a console?