[MRG] Merge pull request #240 from realsec/import-csv-events

basic csv events file import (with default options)

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.0-beta-2
+current_version = 2.1.0
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>.*)-(?P<build>\d+))?

.gitignore

@@ -24,6 +24,6 @@ venv1/
 nohup.out
 celerybeat-schedule.db
 .scannerwork/
-
+source/app/static/assets/dist/
 source/app/static/assets/img/graph/*
-!source/app/static/assets/img/graph/*.png
+!source/app/static/assets/img/graph/*.png

README.md

@@ -6,7 +6,7 @@
 <p align="center">
   Incident Response Investigation System
   <br>
-  <i>Current Version v2.1.0-beta-2</i>
+  <i>Current Version v2.1.0</i>
   <br>
   <a href="https://v200.beta.dfir-iris.org">Online Demonstration</a>
 </p>
@@ -52,7 +52,7 @@ git clone https://github.com/dfir-iris/iris-web.git
 cd iris-web
 
 # Checkout to the last tagged version 
-git checkout v2.1.0-beta-2
+git checkout v2.1.0
 
 # Copy the environment file 
 cp .env.model .env

docker-compose.yml

@@ -28,7 +28,7 @@ services:
     build:
       context: docker/db
     container_name: iriswebapp_db
-    image: iriswebapp_db:v2.1.0-beta-2
+    image: iriswebapp_db:v2.1.0
     restart: always
     # Used for debugging purposes, should be deleted for production
     ports:
@@ -48,7 +48,7 @@ services:
     build:
       context: .
       dockerfile: docker/webApp/Dockerfile
-    image: iriswebapp_app:v2.1.0-beta-2
+    image: iriswebapp_app:v2.1.0
     container_name: iriswebapp_app
     command: ['nohup', './iris-entrypoint.sh', 'iriswebapp']
     volumes:
@@ -86,7 +86,7 @@ services:
     build:
       context: .
       dockerfile: docker/webApp/Dockerfile
-    image: iriswebapp_app:v2.1.0-beta-2
+    image: iriswebapp_app:v2.1.0
     container_name: iriswebapp_worker
     command: ['./wait-for-iriswebapp.sh', 'app:8000', './iris-entrypoint.sh', 'iris-worker']
     volumes:
@@ -122,7 +122,7 @@ services:
       args:
         NGINX_CONF_GID: 1234
         NGINX_CONF_FILE: nginx.conf
-    image: iriswebapp_nginx:v2.1.0-beta-2
+    image: iriswebapp_nginx:v2.1.0
     container_name: iriswebapp_nginx
     environment:
       - IRIS_UPSTREAM_SERVER