Itay Mizeretz b83ca0536f Merge branch 'develop' into feature/detect-cross-segment-traffic ... # Conflicts: # infection_monkey/network/network_scanner.py # monkey_island/cc/services/report.py		2018-04-30 20:38:13 +03:00
..
binaries	directory placeholder	2016-07-20 01:08:35 +03:00
environment	Fix CR	2018-02-25 18:23:52 +02:00
resources	Tick under report, while map is still running fixed. Now tick only apears after map generation is finished.	2018-04-29 20:14:17 +03:00
services	Merge branch 'develop' into feature/detect-cross-segment-traffic	2018-04-30 20:38:13 +03:00
ui	Merge branch 'develop' into feature/detect-cross-segment-traffic	2018-04-30 20:38:13 +03:00
__init__.py	organize cc server files	2017-08-25 17:47:08 +03:00
app.py	Merge branch 'develop' into feature/send-raw-log	2018-02-27 19:32:28 +02:00
auth.py	Fix CR	2018-02-25 18:23:52 +02:00
database.py	Fix CR	2018-02-27 19:13:28 +02:00
encryptor.py	Add global encryptor	2018-02-13 16:29:24 +02:00
main.py	Add parent path for python paths (for common code)	2018-02-27 14:03:50 +02:00
server_config.json	Add server config file and use in frontend+backend	2018-02-22 20:33:40 +02:00
utils.py	Fixed CR	2018-01-16 17:23:17 +02:00