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 |
fbsanchez
|
08a240746c
|
breadcrum improvement discovery
Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad
|
2019-03-26 17:28:31 +01:00 |
alejandro-campos
|
a0f4eb1910
|
change discovery page title
Former-commit-id: 81bf2dc3d489acc1871f6c4cd385fc0f1c1b43aa
|
2019-03-26 16:10:03 +01:00 |
|
alejandro-campos
|
0d8322aeda
|
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: a9ac8888641116a4e98fbe7ac2d99901e771f275
|
2019-03-26 15:42:47 +01:00 |
|
alejandro-campos
|
ec999341ba
|
change discovery headers and add breadcrumbs to them
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
|
2019-03-26 15:42:33 +01:00 |
Daniel Barbero Martin
|
e3b0b7ad11
|
fixed update progress bars task for 3 second
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
|
2019-03-26 15:38:47 +01:00 |
|
Daniel Barbero
|
0593e72f3e
|
move custom net scan and script to OPEN
Former-commit-id: ad30ba98670d23ff895b95beb9f58d1105473e3d
|
2019-03-15 09:11:18 +01:00 |
|
fbsanchez
|
8c8f368993
|
WIP: NetworkMaps rebuild
Former-commit-id: d3ca9d0de1b718a35bbc4aae80982b2c4705a454
|
2019-03-14 18:51:48 +01:00 |
|
fbsanchez
|
06f8aae91a
|
WIP NetworkMap class
Former-commit-id: 575e0b5d078d01ac82ce313eda57084441fb4301
|
2019-03-12 16:22:28 +01:00 |
|
fbsanchez
|
c6fa365b90
|
minor fix force discovery console task
Former-commit-id: be2a85079f51fca0222ac25f2f93ad5a14f3542d
|
2019-03-12 10:47:28 +01:00 |
|
daniel
|
00283a5c6a
|
progress task list
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
|
2019-03-07 14:45:26 +01:00 |
|
daniel
|
d722c39393
|
add custom net scan
Former-commit-id: 61df342754f17b2ecfe3ad06055e9c5b73617d03
|
2019-03-06 17:14:32 +01:00 |
|
fbsanchez
|
41138fbfbb
|
discovery tasks assimilate cron
Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f
|
2019-03-01 15:26:05 +01:00 |
|
fbsanchez
|
b4170ca285
|
minor fixes, removed tuser_task_scheduled from tasklist, also cde over ipam references
Former-commit-id: 46be3614b9aeb9837748149a805427d68a07f566
|
2019-03-01 11:08:49 +01:00 |
|
alejandro-campos
|
52d6dfe815
|
fix discover task view
Former-commit-id: 5475d6be802cd4e7280d12aed6f8f91f7833ed98
|
2019-02-28 12:00:43 +01:00 |
|
fbsanchez
|
7ed3252ca5
|
minor fixes
Former-commit-id: 75b33343bed508ff3ff136fa0fedc5d9d8c952be
|
2019-02-26 20:23:52 +01:00 |
|
fbsanchez
|
24a1adfb9f
|
minor fix
Former-commit-id: 6729d11217d0fecb7b64283b6e4d0485b9bdfdc8
|
2019-02-26 20:08:01 +01:00 |
|
fbsanchez
|
a8874f9b1b
|
Minor fixes
Former-commit-id: c3abb9964c61f0535ab59644f6eb1d0a8328212a
|
2019-02-26 20:00:41 +01:00 |
|
fbsanchez
|
5382f07ae2
|
Comment updates in wizard class
Former-commit-id: 9fbb1d0c6499dd1ad71c472970b3993193b581da
|
2019-02-26 17:42:12 +01:00 |
|
fbsanchez
|
5b3ce09515
|
Comment updates in wizard class
Former-commit-id: 0b820729a631d906fe4816ba74f84f700b500c01
|
2019-02-26 17:41:42 +01:00 |
|
fbsanchez
|
c38ac4b837
|
Updated breadcrum
Former-commit-id: 51c14ea50e6c7d419d610ef1b52c4769214495ef
|
2019-02-26 10:34:37 +01:00 |
|
fbsanchez
|
1f26a8c4b3
|
Updated message warnings in Tasklist
Former-commit-id: beb870813818ff8a7000ffaac7e09f326f0bf253
|
2019-02-25 11:30:09 +01:00 |
|
fbsanchez
|
4da8f54f84
|
Updated message warnings in Tasklist
Former-commit-id: 9f8324e4f882e14451bda7034b1ff081c14a7a41
|
2019-02-25 11:29:39 +01:00 |
|
fbsanchez
|
797f922748
|
Discovery Tasklist minor fixes
Former-commit-id: 693f181168f74f93ad9a3ce628d0defd9ef72d02
|
2019-02-23 12:13:54 +01:00 |
|
fbsanchez
|
8b5f50f883
|
Discovery minor fixes
Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266
|
2019-02-22 19:18:07 +01:00 |
|
daniel
|
f0c9d16318
|
fixed errors view discovery task list
Former-commit-id: 7e3160cde5c0fa46ee3d918789ffec4091f42c31
|
2019-02-22 13:45:59 +01:00 |
|
daniel
|
3d2bfa95b5
|
add table console task in discovery
Former-commit-id: b13571167c063188102a8473fb57fa63c18bece3
|
2019-02-22 12:53:35 +01:00 |
|
fbsanchez
|
64679ee72e
|
discovery minor fixes
Former-commit-id: 6d7a1a75bcb6844c839f34a2a2bfaf3f96734db8
|
2019-02-21 18:00:50 +01:00 |
|
fermin831
|
9e9d915609
|
Modified redirection
Former-commit-id: 77dd6fee3a71064e790bd020afbcc91edbdfe20c
|
2019-02-21 15:35:44 +01:00 |
|
fbsanchez
|
4148387c50
|
Updates discovery
Former-commit-id: e99072a2b7a1ddd528698e12bdfe75b0b56ba25b
|
2019-02-21 13:05:48 +01:00 |
manuel
|
c385a3191f
|
minor fixes
Former-commit-id: ffb62390a5edaa158507f253cf7fb23c690f8fcf
|
2019-02-21 11:21:56 +01:00 |
|
manuel
|
ad3e2b88bf
|
Minor fixes Wiz.Discovery
Former-commit-id: 750cd3ab1902ed3eda9806aa9b505d5e4a1175be
|
2019-02-21 11:19:38 +01:00 |
|
fermin831
|
0ed6c6d620
|
Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
|
2019-02-20 16:54:52 +01:00 |
|
fermin831
|
f49b26692e
|
Fixes on wizards
Former-commit-id: 98804bde49e19a7ecb3e2749a8955ac656da54a8
|
2019-02-20 16:47:29 +01:00 |
|
fbsanchez
|
414ff282e2
|
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: 2d10f49e4eb2078eebd2f6164866fe2a8412d6a3
|
2019-02-20 14:38:14 +01:00 |
|
fbsanchez
|
4834561e87
|
Wiz. minor fixes
Former-commit-id: b3963bf5994a8f9829922e0a1b0be3a20fc54fba
|
2019-02-20 14:38:00 +01:00 |
|
fermin831
|
73a5e691ef
|
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-1798-monitorizacion-aws-amazon
Conflicts:
pandora_console/godmode/wizards/Wizard.main.php
Former-commit-id: dead86a654f8b2873721387233a9c9797b0cd8b1
|
2019-02-20 13:57:54 +01:00 |
|
fbsanchez
|
331b09c520
|
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: 7220701d8016a2963cd80cb807bf037af37c2730
|
2019-02-20 12:32:27 +01:00 |
|
fbsanchez
|
f19bdf956e
|
Wiz. minor fix default value url in goback button
Former-commit-id: 434b2acb09290f11c8804024adb8834b86eeda73
|
2019-02-20 12:32:12 +01:00 |
|
fbsanchez
|
8872968600
|
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: c3eed02e448a213a65159897355dc44d844b9741
|
2019-02-20 11:11:37 +01:00 |
|
fbsanchez
|
a63e497497
|
Wiz. Added textarea input
Former-commit-id: 319ab37377e6649c1cd6c6adea1e956e934f2e23
|
2019-02-20 11:11:26 +01:00 |
|
fbsanchez
|
8ec5cda8bf
|
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: 057a5915c8397b3798dcbe97f6ac3f1302879c8c
|
2019-02-20 10:59:05 +01:00 |
|
fbsanchez
|
65db8482c1
|
Wiz. Added option url to printGoBackButton
Former-commit-id: fd0c76ce5efef9902cbda2817b13e59e6672c972
|
2019-02-20 10:58:56 +01:00 |
|
fbsanchez
|
e2bb9e9a15
|
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: 4d47587e87964b25e4d5bc2a16551846507c266c
|
2019-02-20 10:54:09 +01:00 |
|
fbsanchez
|
e9d97e8010
|
Wiz. Added option url to printGoBackButton
Former-commit-id: 31c9c56da3475f9b1510904ad7237f993c0a6ccf
|
2019-02-20 10:53:54 +01:00 |
|
fbsanchez
|
c0e1d0b85d
|
Merge remote-tracking branch 'origin/ent-3431-discovery-host-devices' into ent-3394-discovery-applications
Former-commit-id: 420e2b09287bccdacc979be2381159a1ad942a27
|
2019-02-20 08:59:30 +01:00 |
|
manuel
|
3d2ae47543
|
Added prepareBreadcrum function
Former-commit-id: caf781a20bdd16bed7347bf755e2bf0da6ae7e99
|
2019-02-20 08:41:15 +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 |
|
fermin831
|
55af128cd5
|
Modified snmp browser to work with wizard
Former-commit-id: c8d37e06967ed43867320ae89fd3dc2bede7b0ce
|
2019-02-19 20:14:14 +01:00 |