Commit Graph

1484 Commits

Author SHA1 Message Date
Daniel Rodriguez e2ae42dd89 Merge branch 'ent-7060-gestion-basica-de-configuracion-de-equipos-de-red' into 'develop'
NCM

See merge request artica/pandorafms!4434
2021-10-26 08:21:01 +00:00
alejandro.campos@artica.es aa24bf545c fixed ipam supernet tree view when there is no data show 2021-10-25 12:14:21 +02:00
fbsanchez 5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
fbsanchez 98c43ea1e7 WIP NCM 2021-10-19 21:11:09 +02:00
Jose Gonzalez 304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
Daniel Rodriguez 2118f44a7a Merge branch 'ent-7964-nug-visual-en-tree-view' into 'develop'
Added title attr to module names in treeview

See merge request artica/pandorafms!4412
2021-10-07 08:42:01 +00:00
Calvo 50dbeb03ce Fix entities on modules with large name treeview 2021-10-06 10:41:55 +02:00
Daniel Rodriguez fb7e443138 Merge branch 'ent-7938-bug-visual-en-item-odometro-cv' into 'develop'
Ent 7938 bug visual en item odometro cv

See merge request artica/pandorafms!4386
2021-10-05 09:20:47 +00:00
Daniel Rodriguez a794f30141 Merge branch 'ent-8060-bug-modal-networkmaps' into 'develop'
Fixed issue with node actions

Closes pandora_enterprise#8060

See merge request artica/pandorafms!4438
2021-10-05 09:19:26 +00:00
marcos 7418719861 resolved merge conflict 2021-10-04 12:27:57 +02:00
marcos 30bf0ee163 Merge remote-tracking branch 'origin/master' into ent-7938-bug-visual-en-item-odometro-cv 2021-10-04 11:56:08 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop'
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
2021-10-01 12:48:09 +00:00
Jose Gonzalez 5eb66e5c6e Fixed issue with node actions 2021-10-01 14:05:41 +02:00
Daniel Rodriguez 8d07ccb9cc Merge branch 'ent-7309-Expand-tree-snmp-browser' into 'develop'
fixed expand all tree tool in snmp browser

See merge request artica/pandorafms!4262
2021-09-30 12:12:57 +00:00
Daniel Rodriguez 04d683286f Merge branch 'ent-5193-IPAM-Supernet-Map-Tree-View' into 'develop'
implemented supernet treeview

See merge request artica/pandorafms!4431
2021-09-29 10:10:26 +00:00
Daniel Rodriguez 08fe77ddaa Merge branch 'ent-7766-query-extra-fields-componentes-remotos-wmi' into 'develop'
WMI remote componente add text _field_wmi_n_

See merge request artica/pandorafms!4286
2021-09-28 12:57:50 +00:00
alejandro.campos@artica.es 87ec5970a1 implemented supernet treeview 2021-09-28 13:44:12 +02:00
Calvo 46136a66ca Merge remote-tracking branch 'origin/develop' into ent-7651-anadir-nodos-filtrando-por-grupo-en-un-mapa-de-red-no-es-recursivo 2021-09-27 10:40:50 +02:00
Daniel Rodriguez 49961ed261 Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop'
Ent 6296 10650 añadir widget de lista de servicios

See merge request artica/pandorafms!4355
2021-09-24 09:09:28 +00:00
Jose Gonzalez 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Maya 30ab96003c #6296 Fixed info popup and status images 2021-09-21 13:22:37 +02:00
Calvo 774e163ff0 Added title attr to module names in treeview 2021-09-15 17:41:51 +02:00
Daniel Rodriguez 2e7dadb04e Merge branch 'ent-7591-mensaje-error-timeout-snmp-en-browser' into 'develop'
Fix format on snmp browser error messages

See merge request artica/pandorafms!4276
2021-09-08 14:37:14 +00:00
marcos 9552b9716e reduce title of longer module name odometer VC 2021-09-06 12:28:57 +02:00
Daniel Rodriguez 8397f778b3 Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop'
add not option in monitor detail filter

See merge request artica/pandorafms!4112
2021-09-01 08:54:49 +00:00
Daniel Rodriguez f94ad30df4 Merge branch 'ent-7506-ediciones-acciones-modo-advanced-no-amplia' into 'develop'
fixed error with manual resize advanced action alerts

See merge request artica/pandorafms!4381
2021-09-01 08:52:53 +00:00
Daniel Rodriguez f53969731a Merge branch 'ent-7638-11735-vista-de-eventos-en-dashboard-menus-descolocados' into 'develop'
fixed error with wrong event list dialog in dashboard

See merge request artica/pandorafms!4374
2021-08-31 10:03:30 +00:00
marcos 3cb2b92774 fixed error with manual resize advanced action alerts 2021-08-31 11:47:36 +02:00
marcos 80f4e25b92 change first option value when not_condition its enabled 2021-08-30 11:19:53 +02:00
marcos 05de5f643f fixed error with wrong event list dialog in dashboard 2021-08-27 09:20:30 +02:00
José González 8982e3d49b Fixed typo 2021-08-25 10:38:22 +02:00
José González 64982ee292 Fix issues with select inputs 2021-08-24 11:52:37 +02:00
José González b515bfe443 Fix merge 2021-08-19 09:39:13 +02:00
Daniel Maya d70752baa1 Added services view widget 2021-08-13 14:12:21 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez cb498a9fe9 Merge branch 'ent-7441-Tree-View-Widget-no-coge-los-no-inicializados' into 'develop'
Ent 7441 tree view widget no coge los no inicializados

See merge request artica/pandorafms!4277
2021-08-10 07:00:12 +00:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop'
fixed xss vulnerability

See merge request artica/pandorafms!4196
2021-08-09 08:59:44 +00:00
Daniel Rodriguez 604ef4bc89 Merge branch 'ent-7442-Metaconsole-Dashboard-WUX-Transaction-Stats-no-encuentra-trans' into 'develop'
Ent 7442 metaconsole dashboard wux transaction stats no encuentra trans

Closes pandora_enterprise#7442

See merge request artica/pandorafms!4295
2021-08-06 12:53:06 +00:00
Daniel Maya 77f5ad2a6d Fixed odometer in dashboard 2021-08-05 11:57:31 +02:00
Daniel Maya f9c95e0145 oMerge branch 'develop' into ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica 2021-08-04 09:57:57 +02:00
José González 8968d6abb9 Fixed leafs for modules 2021-07-19 18:04:25 +02:00
José González 950ca956a3 Fixed issues with subgroups in Tree view 2021-07-19 11:17:36 +02:00
Daniel Maya 71767a3f11 Added basic chart 2021-07-16 14:16:45 +02:00
Calvo 7890c4269c Added checkbox for group recursion in network maps 2021-07-14 18:00:07 +02:00
José González 3263ef8b9a Fix issue with WUX Trans Stats 2021-07-13 17:26:03 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/mr/48.sql
2021-07-13 10:01:59 +02:00
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
Calvo 19e9613e3e WMI remote componente add text _field_wmi_n_ 2021-07-12 12:17:38 +02:00
Daniel Maya a73a8ff926 show not init agents in tree 2021-07-07 17:17:36 +02:00