Commit Graph

8 Commits

Author SHA1 Message Date
Daniel Goldberg f37c3aaa2c
Merge pull request #114 from guardicore/master
Rebase develop onto master
2018-04-02 16:44:11 +03:00
Daniel Goldberg 2d9481f142
Merge pull request #111 from guardicore/bugfixes
Bugfixes
2018-04-02 16:43:09 +03:00
Daniel Goldberg 9d59e9164c
Merge pull request #113 from guardicore/master
Rebase develop onto master
2018-04-02 14:39:48 +03:00
Oran Nadler ac8f218586 fix unicode bug 2018-04-02 01:47:15 -07:00
Daniel Goldberg 3aa1b9e5a9 Bugfix in _cast_by_example, see issue #109 2018-03-29 15:39:47 +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 de4e4b9ea1 rename chaos_monkey folder to infection_monkey 2018-02-19 11:35:34 +02:00