José González
|
623b729001
|
Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
# pandora_agents/pc/Win32/pandora_agent.conf
# pandora_agents/win32/bin/pandora_agent.conf
# pandora_console/extensions/realtime_graphs.php
# pandora_console/godmode/snmpconsole/snmp_alert.php
# pandora_console/include/functions_ui.php
# pandora_console/install.php
# pandora_console/operation/agentes/realtime_win.php
|
2020-12-14 11:10:35 +01:00 |
Marcos Alconada
|
f72d924f1e
|
ticket 6435
|
2020-12-02 10:10:34 +01:00 |
|
Jose Gonzalez
|
649442f794
|
Updated copyrights
|
2020-11-27 13:52:35 +01:00 |
fbsanchez
|
42cca865ac
|
groups_get_children and propagate update
|
2020-10-21 11:38:57 +02:00 |
Manuel Montes
|
f78ae89a99
|
Ent 6177 mejoras para el public link de dashboards
|
2020-09-24 16:20:13 +02:00 |
|
fbsanchez
|
e66f33fd37
|
WIP Cluster references updated
|
2020-05-22 12:14:01 +02:00 |
|
fbsanchez
|
b0e8287c61
|
Wip cluster view
|
2020-05-21 19:28:24 +02:00 |
|
fbsanchez
|
523212afb8
|
WIP cluster view
|
2020-05-20 19:04:42 +02:00 |
daniel
|
709201bf23
|
dashboards
|
2020-03-26 12:29:38 +01:00 |
Luis
|
56a2970755
|
Ent 5112 error nodos ficticios widget mapa red
|
2020-02-06 14:32:43 +01:00 |
Tatiana Llorente
|
28b585196b
|
Ent 5099 dobles interfaces en mapas de red no se visualizan
|
2020-01-15 14:11:36 +01:00 |
Daniel Rodriguez
|
c30e9eb1fe
|
Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop'
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red
See merge request artica/pandorafms!2896
|
2020-01-08 11:33:27 +01:00 |
|
fbsanchez
|
ede4cedf62
|
Fix networkmap module key assignment
|
2019-12-11 16:42:50 +01:00 |
|
Tatiana Llorente
|
5dc9843e89
|
Fixed bug with shape in fictional nodes in network maps
|
2019-11-19 16:53:12 +01:00 |
|
Tatiana Llorente
|
dd2ace99e1
|
Check permissions to reset a network map - #4728
|
2019-10-11 13:51:52 +02:00 |
|
fbsanchez
|
48e6fef0b7
|
Event filters
|
2019-06-11 12:58:18 +02:00 |
|
fbsanchez
|
c741020538
|
styles review
|
2019-06-04 13:57:55 +02:00 |
|
fbsanchez
|
9a12b34847
|
Updates styling
|
2019-05-28 12:13:29 +02:00 |
|
Luis Calvo
|
1bfd91725e
|
Changed <img> to hmtl_print_image
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
|
2019-05-16 17:13:14 +02:00 |
Daniel Maya
|
c31948b7c2
|
Fixed netflow node name
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
|
2019-04-30 17:30:57 +02:00 |
|
Daniel Maya
|
4b73518804
|
Fixed node name in netflow map
Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8
|
2019-04-26 09:54:38 +02:00 |
|
fbsanchez
|
8978b49a8b
|
minor fix while setting node_radius by default
Former-commit-id: 37b603adc1eb025c84b4e6d298815894be8adcf6
|
2019-04-22 09:33:51 +02:00 |
|
Daniel Barbero Martin
|
d5b1ac5565
|
fixed map IPAM
Former-commit-id: a1334a1691a3e861f2510ac7d440f5730928ad9a
|
2019-04-08 18:28:27 +02:00 |
|
Daniel Barbero
|
4808e4ae97
|
fixed errors map ipam
Former-commit-id: 9a1e5460ab40d22135edc75f2adf186f8d56f3d4
|
2019-04-05 16:43:36 +02:00 |
|
fbsanchez
|
11b2fbc245
|
WIP db
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
|
2019-04-02 16:25:29 +02:00 |
|
fbsanchez
|
b0a6ea7415
|
WIP atomic JS map. Minor fix to keep working
Former-commit-id: fee809008311942f1d9ad14aea70ba78e3d6eb3a
|
2019-03-29 20:52:51 +01:00 |
|
fbsanchez
|
4854d4b2df
|
WIP atomic JS map
Former-commit-id: 95736d11295948e5dc20aefcf1293b7882729588
|
2019-03-29 20:31:55 +01:00 |
|
fbsanchez
|
086ee0620e
|
minor fix
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
|
2019-03-27 18:31:02 +01:00 |
fermin831
|
7b901be5fa
|
Changed default font size name on NetworkMap class
Former-commit-id: b1437a7e03eba758d83386166db0063a5fcaf12f
|
2019-03-27 12:42:54 +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 |
|
fbsanchez
|
3c853ff508
|
widget networkmap simple working
Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee
|
2019-03-27 11:47:09 +01:00 |
|
fbsanchez
|
3316d19bd3
|
minor fix
Former-commit-id: ff5da555c29cdde5d632e090f2b9ac779ead262f
|
2019-03-26 17:00:20 +01:00 |
|
fbsanchez
|
2d1463ee0c
|
minor fixes networkmaps
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
|
2019-03-26 16:46:32 +01:00 |
|
fermin831
|
f880d9202a
|
Adde no popup configuration token to avoid to show tooltips
Former-commit-id: d5b6260a065b40dfbc498db077a610c35a9e0fb3
|
2019-03-26 15:27:45 +01:00 |
|
fbsanchez
|
dad791b887
|
relationship management JS
Former-commit-id: 82216265dece0e5d9f77a82b1b22d6ff00265ee1
|
2019-03-25 15:52:15 +01:00 |
|
fbsanchez
|
e1a4250d01
|
NetworkClass RC1
Former-commit-id: bd30ce824e0f50e9684e32268bea396a84ff6744
|
2019-03-25 11:09:22 +01:00 |
|
fbsanchez
|
b5401a500c
|
minor fixes
Former-commit-id: 30e4d5dffa78834088d8644168d4d64b13cf8b08
|
2019-03-25 11:02:16 +01:00 |
|
fbsanchez
|
eac0d66056
|
refresh holding area in networkmap
Former-commit-id: 17492041e3c14d15a6cf96b522ab368e9a2b7974
|
2019-03-22 19:16:45 +01:00 |
|
fbsanchez
|
face622e9e
|
reset-map fixed
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
|
2019-03-22 18:27:12 +01:00 |
|
fbsanchez
|
091e2db13a
|
minor fix
Former-commit-id: 55b56db7a7ca1eee5d48731269d2894425037e3b
|
2019-03-22 16:00:01 +01:00 |
|
fbsanchez
|
732fdafc14
|
custom text in links
Former-commit-id: 31b851b5c296e8beb135a60f6b67ee8a073a28ea
|
2019-03-22 15:08:44 +01:00 |
|
fbsanchez
|
e31607a4e0
|
custom link colors
Former-commit-id: 9aa8f8114494d8b8fd8f010fa5066142fd104f70
|
2019-03-22 15:06:01 +01:00 |
|
fbsanchez
|
9ef66a11c4
|
custom link colors
Former-commit-id: 44a7df6e814679cfff1a0489374c25edcc9ab52c
|
2019-03-22 15:00:02 +01:00 |
|
fbsanchez
|
4910da5e31
|
minor fix map_filter builder
Former-commit-id: 0ef6bcaa84163f21fe0d6bcd869a7b8646581893
|
2019-03-22 14:57:29 +01:00 |
|
fbsanchez
|
a4c048dd29
|
minor fix
Former-commit-id: 1ccd9e446645362fb9b305a699527c5aa2c20369
|
2019-03-22 14:43:55 +01:00 |
|
fbsanchez
|
bc1195e78e
|
minor fix
Former-commit-id: b100cf9398a52a443f934632794da991ea4f2342
|
2019-03-22 14:30:50 +01:00 |
|
fbsanchez
|
3d71d17440
|
minor fix
Former-commit-id: 3d00cc3810df66e79ac69a71ee48df1c9c6b326e
|
2019-03-22 14:27:53 +01:00 |
|
fbsanchez
|
64c4514ace
|
minor fix orphans while no pandora node
Former-commit-id: 067f83b5cd8fc87922c61622873b60753edebf2d
|
2019-03-22 13:16:26 +01:00 |
|
fbsanchez
|
80ecb58f8f
|
minor fix orphans while no pandora node
Former-commit-id: a9f053624ba5c38a08c3589689d4a56cfcfcff37
|
2019-03-22 13:04:53 +01:00 |
|
fbsanchez
|
0d301cd8ed
|
minor fix orphans while no pandora node
Former-commit-id: 5c21ffec17ba10d77921961c6c813b116449d3a0
|
2019-03-22 13:02:57 +01:00 |