Merge pull request #329 from grendel513/master

Fixes #289

Author: devGregA

components/bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "django-DefectDojo",
+  "name": "django-defectdojo",
   "version": "1.0",
   "homepage": "https://github.com/rackerlabs/django-DefectDojo",
   "authors": [

dojo/forms.py

@@ -582,7 +582,8 @@ class Meta:
                    'target_start',
                    'target_end',
                    'engagement',
-                   'percent_complete')
+                   'percent_complete',
+                   'lead')
 
 
 class AddFindingForm(forms.ModelForm):

dojo/templates/base.html

@@ -29,9 +29,6 @@
     <!-- MetisMenu CSS -->
     <link href="{% static "metisMenu/dist/metisMenu.min.css" %}" rel="stylesheet">
 
-    <!-- Timeline CSS -->
-    <link href="{% static "startbootstrap-sb-admin-2/dist/css/timeline.css" %}" rel="stylesheet">
-
     <!-- Custom CSS -->
     <link href="{% static "startbootstrap-sb-admin-2/dist/css/sb-admin-2.css" %}" rel="stylesheet">
 

dojo/tools/nessus/parser.py

@@ -202,9 +202,9 @@ def __init__(self, file, test):
                                        cwe=cwe)
                         find.unsaved_endpoints = list()
                         dupes[dupe_key] = find
-
-                    find.unsaved_endpoints.append(Endpoint(host=ip + (":" + port) if port is not None else ""))
+                    find.unsaved_endpoints.append(Endpoint(host=ip + (":" + port if port is not None else "")))
 
                     if fqdn is not None:
                         find.unsaved_endpoints.append(Endpoint(host=fqdn))
+
         self.items = dupes.values()