Merge pull request #34 from xabiugarte/dev

Update dev branch
Cisco-Talos · Jun 5, 2019 · b06fd2e · b06fd2e
2 parents 360dd5c + cf9f39b
commit b06fd2e
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 1,180 deletions.
diff --git a/server/first/settings.py b/server/first/settings.py
@@ -50,7 +50,7 @@
 INSTALLED_APPS = [
     'www.apps.WwwConfig',
     'engines.apps.EnginesConfig',
-    'django.contrib.admin',
+    # 'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',

diff --git a/server/first/urls.py b/server/first/urls.py
@@ -19,8 +19,8 @@
 
 handler404 = 'www.views.handler404'
 
+# path(r'admin', admin.site.urls),
 urlpatterns = [
-    path(r'admin', admin.site.urls),
     path(r'api', include('rest.urls')),
     path(r'', include('www.urls')),
 ]
diff --git a/server/first_core/disassembly/__init__.py b/server/first_core/disassembly/__init__.py
@@ -72,6 +72,8 @@
 from capstone.mips import MIPS_OP_MEM
 from capstone.mips import MIPS_OP_INVALID
 
+from capstone import Cs
+
 
 arch_mapping = {
     'ppc' : (CS_ARCH_PPC, CS_MODE_32),

diff --git a/server/www/static/www/css/talos-guy.css b/server/www/static/www/css/talos-guy.css