fermin831
|
b2f046e4d6
|
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
|
2019-03-27 12:11:23 +01:00 |
|
fermin831
|
9ee095406b
|
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
|
2019-03-27 11:59:25 +01:00 |
fbsanchez
|
3038de3a9d
|
minor fixes
Former-commit-id: 73dbbaa42f3b6120400da688dee7a0499bf31796
|
2019-03-27 11:06:57 +01:00 |
Daniel Barbero Martin
|
5504741a9d
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: d734637dea22b18b1d30a3d8575cd45500558e29
|
2019-03-26 18:48:49 +01:00 |
Ramon Novoa
|
c25143c27e
|
Add a notification for 'limited mode'.
Former-commit-id: dce72c7a9ea452029e5650a2012ff35cc6eca9b8
|
2019-03-26 11:53:03 +01:00 |
|
fbsanchez
|
e672456998
|
fixes satellite contact interval detector
Former-commit-id: b3536e29fd7ae1330667eee7bf98a55ef3f65e4b
|
2019-03-11 18:04:23 +01:00 |
|
fbsanchez
|
97e6c7c77d
|
minor fix notif. satellite crashed
Former-commit-id: 829dc9d8ab224698bfb33582917ca8008ba7b255
|
2019-03-07 11:57:31 +01:00 |
|
fbsanchez
|
aef10cf649
|
Fixed grown in notifications
Former-commit-id: c563f2388d27d4fffbcfaf34fbd1c4d83ad4ef84
|
2019-03-06 19:39:07 +01:00 |
|
fbsanchez
|
a860b293e3
|
minor fixes in url and descriptions (discovery)
Former-commit-id: a53542c61164a41cd4c2befea73191e9f74e5800
|
2019-03-06 18:28:00 +01:00 |
alejandro-campos
|
0548fdd95f
|
Change english strings
Former-commit-id: 47d1b455f4997ce7b63672678aaeb42a8205e957
|
2019-03-05 16:48:27 +01:00 |
|
fbsanchez
|
d89e3993e7
|
WIP first tasks
Former-commit-id: 4fbdab2389d5727c44693b129baa4ceadc6934ae
|
2019-03-04 20:02:35 +01:00 |
|
fbsanchez
|
756fdd2cd4
|
minor fix in supervisor - server status global counter
Former-commit-id: f34daeb57a442b7f3b299e3d72d40317b0e9e0c0
|
2019-03-04 16:43:48 +01:00 |
|
fbsanchez
|
5e496d0d7a
|
Fixed url target in Supervisor
Former-commit-id: 4e69ec7a157d8bceb3cbfc88c52a886a4353dc0e
|
2019-03-04 14:52:57 +01:00 |
|
fbsanchez
|
4289684e00
|
Cloud Discovery RC1
Former-commit-id: 9933be0c76b44592783e686bfa2da9ab63df1022
|
2019-02-23 00:01:59 +01:00 |
|
fbsanchez
|
8b5f50f883
|
Discovery minor fixes
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
|
2019-02-22 19:18:07 +01:00 |
|
fbsanchez
|
4abf19722b
|
Minor fixes and improvements. Discovery
Former-commit-id: d4410ddca6aec18ed28b7b0236ee16a3e8a6d2b8
|
2019-02-22 18:12:01 +01:00 |
|
fbsanchez
|
1feebae564
|
removed fullurl supervisor
Former-commit-id: 74cc731977477c444150d49aff9ab062ddac065a
|
2019-02-22 13:33:46 +01:00 |
|
fbsanchez
|
e32c4025a4
|
Supervisor. minor fixes
Former-commit-id: 036bc6a871db86d7a8925c7d5e2531d9f62ca839
|
2019-02-21 14:18:33 +01:00 |
|
fbsanchez
|
fd77b94f96
|
Fix regexp Supervisor
Former-commit-id: 7dc32dd119ae78a3158e7c5d20bc5f73a8c94d2f
|
2019-02-21 14:16:17 +01:00 |
|
fbsanchez
|
69abba260a
|
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: eec0a9614d1dee466d5adb59c9f39d2599360e27
|
2019-02-19 20:27:34 +01:00 |
|
fbsanchez
|
fa3f548cdd
|
Several changes for Wiz.App support
Former-commit-id: 7c86d2e601771686a69d3f1b846638a427a25d6e
|
2019-02-19 20:27:05 +01:00 |
|
fbsanchez
|
1b82a970b1
|
WIP: App wiz
Former-commit-id: aa969dc2fead693977959374c747f046676c5fed
|
2019-02-19 14:36:16 +01:00 |
|
fbsanchez
|
85371424ee
|
Minor fixes and status check
Former-commit-id: 47a7e75579927c0ac109f303b77ebcc273334581
|
2019-02-19 11:13:07 +01:00 |
|
fbsanchez
|
ed63ef47fa
|
Moved ReconServer to DiscoveryServer
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
|
2019-02-13 14:56:10 +01:00 |
|
fbsanchez
|
e90d4b7256
|
Supervisor added blacklist to avoid mail twice
Former-commit-id: e2f03306076d90f9abe312694ea1fa2298ee7c62
|
2019-02-07 18:29:20 +01:00 |
|
fbsanchez
|
42b0afb884
|
Supervisor minor fixes
Former-commit-id: 84171e197df0a016a9a4b7d0e49f0412b65ee864
|
2019-02-07 18:07:52 +01:00 |
|
fbsanchez
|
681ad67028
|
ConsoleSuperviso - mailing support and minor fixes
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
|
2019-02-07 18:00:51 +01:00 |
|
fbsanchez
|
dc9decde42
|
ConsoleSupervisor
Former-commit-id: 3c40e628883f032a449862d0161659586819e6df
|
2019-02-07 16:24:49 +01:00 |