fbsanchez
|
128a97d254
|
fix mr 26
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
|
2019-03-27 17:38:08 +01:00 |
|
fbsanchez
|
66b2102052
|
Merge remote-tracking branch 'origin/develop' into fix/mr
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
|
2019-03-27 17:09:46 +01:00 |
|
fbsanchez
|
6ebbe54448
|
minor fix
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
|
2019-03-27 17:06:14 +01:00 |
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 |
alejandro-campos
|
d1bd5fbb1a
|
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 914a944b96af8bceb26bbb89dbac25452097e20a
|
2019-03-26 13:06:12 +01:00 |
|
fbsanchez
|
1238f15190
|
discovery task advanced summary support
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
|
2019-03-25 17:32:18 +01:00 |
|
fermin831
|
2711eb59ea
|
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/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395
|
2019-03-25 09:20:06 +01:00 |
|
fermin831
|
a0f4163c1d
|
Fix netflow filters on database
Former-commit-id: ae1326117f0a78f2234485f1a260df2923e6ce6b
|
2019-03-20 17:19:56 +01:00 |
|
alejandro-campos
|
791a3ccfc6
|
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 4ac64c1af6d4487f6a5d1ad1a55400b1879bb730
|
2019-03-20 15:48:37 +01:00 |
|
alejandro-campos
|
67d24860d1
|
Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2
Former-commit-id: 8a9d1b18d9d3894f2ef7823d3b5624b5c7f59088
|
2019-03-20 15:46:33 +01:00 |
|
fermin831
|
bc9192b98a
|
[Netflow] Merge three reports in one
Former-commit-id: 1a7fb1aaacda5009ba2ab911dc69594133517f91
|
2019-03-19 17:33:39 +01:00 |
|
fermin831
|
b660da6e84
|
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/install.php
Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b
|
2019-03-14 10:49:16 +01:00 |
|
fbsanchez
|
750c64fbd7
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
|
2019-03-13 09:52:00 +01:00 |
manuel
|
c41c9d10e0
|
Changed sql files
Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b
|
2019-03-08 10:01:55 +01:00 |
|
alejandro-campos
|
09897591c3
|
Add extended events to event reporting tables
Former-commit-id: afbf41109bc382c6b26cb0e6b97d5dc3d580c256
|
2019-03-05 15:03:05 +01:00 |
|
Fermin
|
287ce78260
|
Move tnetwork_matrix to mr 26
Former-commit-id: 731ffaeb7253345bc83afe645f788e6a130080b4
|
2019-02-28 18:18:20 +01:00 |