Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

basic csv events file import (with default otions) #240

Merged
merged 12 commits into from
May 22, 2023
Merged

basic csv events file import (with default otions) #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
645b028
basic csv events file import (with default otions)
hekiri May 7, 2023
7dc7d25
[MRG] Merge pull request #244 from dfir-iris/develop
whikernel May 14, 2023
f6e85f4
[FIX] Track activity when deleting cases
whikernel May 14, 2023
9cde605
Bump version: 2.1.0-beta-2 → 2.1.0
whikernel May 14, 2023
1fc9720
[ADD] dist in gitignore
whikernel May 22, 2023
b2263c8
[MRG] Merge branch 'master' into develop
whikernel May 22, 2023
77d48b1
[FIX] Gitignore
whikernel May 22, 2023
c0bb78c
[FIX] Case timeline bulk import of events
whikernel May 22, 2023
5eeaa6a
[MRG] Merge branch 'develop' into import-csv-events
whikernel May 22, 2023
6c20e38
[FIX] generate_events_sample_csv
whikernel May 22, 2023
852adfc
[FIX] JS for timeline events import
whikernel May 22, 2023
afda599
[FIX] Upload bulk events in timeline
whikernel May 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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+))?
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading