Itay Mizeretz
|
dcbcc34af0
|
Merge branch 'develop' into feature/support-subnet-in-config
# Conflicts:
# monkey_island/cc/services/report.py
|
2018-04-11 11:33:16 +03:00 |
Daniel Goldberg
|
9b44fc8b98
|
Adds configuration option to turn Azure collection on and off
Merge mimikatz and Azure into system info collection settings.
|
2018-03-29 11:01:06 +03:00 |
|
Itay Mizeretz
|
a20cb16b48
|
Merge branch 'develop' into feature/send-raw-log
# Conflicts:
# infection_monkey/main.py
# monkey_island/cc/app.py
# monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
|
2018-02-27 19:32:28 +02:00 |
|
Itay Mizeretz
|
0de15736ac
|
rename and move range_fixed
|
2018-02-26 16:34:23 +02:00 |
|
Itay Mizeretz
|
be54878ad9
|
Merge branch 'develop' into feature/support-subnet-in-config
|
2018-02-26 16:12:24 +02:00 |
|
Itay Mizeretz
|
de4e4b9ea1
|
rename chaos_monkey folder to infection_monkey
|
2018-02-19 11:35:34 +02:00 |