Commit Graph

110 Commits

Author SHA1 Message Date
Itay Mizeretz 03c32025aa Update icons 2018-02-27 19:39:32 +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 1d07e5f98f Move range to common code folder 2018-02-26 18:39:49 +02:00
Itay Mizeretz e57ce1099f Remove unecessary parameters and members.
Create better abstraction
2018-02-26 17:53:16 +02:00
Itay Mizeretz 816be5191b Add is_in_range as abstract method 2018-02-26 17:35:32 +02:00
Itay Mizeretz 4730480db9 Remove ClassCRange and RelativeRange 2018-02-26 17:35:00 +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 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