p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
920 Commits 30 Branches 0 Tags 47 MiB
Commit Graph

7 Commits

Author SHA1 Message Date
Itay Mizeretz be5d17ab42 Merge branch 'develop' into bugfix/upgrade-windows-32-to-64 
# Conflicts:
#	infection_monkey/monkey.py
 2018-04-11 19:21:52 +03:00
Itay Mizeretz 148684d78f Fixed most CR 2018-04-11 19:07:03 +03:00
Itay Mizeretz 260607b685 Use dedicated api to determine server is running 2018-02-28 18:26:31 +02:00
Itay Mizeretz 355a75feef seperate the wakeup and server lookup processes 2018-02-28 16:21:44 +02: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 a69f7d93a3 Merge remote-tracking branch 'origin/develop' into bugfix/rename_Cnc_island 2018-02-22 10:57:08 +02:00
Itay Mizeretz de4e4b9ea1 rename chaos_monkey folder to infection_monkey 2018-02-19 11:35:34 +02:00