Commit Graph

5471 Commits

Author SHA1 Message Date
Rafael Ameijeiras 2fbc72a49a Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop'
Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2

See merge request artica/pandorafms!6603
2023-10-30 08:31:09 +00:00
Rafael Ameijeiras 50d3139dc7 Merge branch 'ent-10602-Inventory-widget-2' into 'develop'
Ent 10602 inventory widget 2

See merge request artica/pandorafms!6589
2023-10-25 11:07:55 +00:00
Jonathan 08140b87a7 #12286 no enable click user not logged public VC 2023-10-25 12:29:55 +02:00
Daniel Cebrian f3fe59bfda #12288 fixed spinner in button link 2023-10-24 14:53:34 +02:00
Daniel Cebrian 638ba75894 #12288 fixed spinner in empty page 2023-10-24 14:18:48 +02:00
Daniel Cebrian f419f0931d #12288 fixed filters in netflow explorer 2023-10-23 16:20:32 +02:00
Daniel Cebrian 8d624fe371 Merge branch 'develop' into ent-12288-varios-bugs-en-netflow 2023-10-23 14:59:20 +02:00
alejandro.campos@artica.es a747b8fa56 fix 2023-10-23 14:09:38 +02:00
Diego Muñoz-Reja 48c314669a Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop'
Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización)

See merge request artica/pandorafms!6485
2023-10-23 07:24:20 +00:00
Daniel Cebrian 7bee2a9784 #12288 fixed translate 2023-10-20 10:15:48 +02:00
Daniel Cebrian 04e001c010 #12288 fixed string translate 2023-10-20 10:10:27 +02:00
Matias Didier dcd891eedb Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop'
Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2

See merge request artica/pandorafms!6578
2023-10-20 05:51:32 +00:00
Daniel Cebrian 7bba90cd4f #12288 added spinner in netflow and fixed bug filter 2023-10-19 17:18:13 +02:00
Jonathan 98388bb7d2 #12286 fix dashboard vulnerability login admin 2023-10-19 17:06:01 +02:00
Rafael Ameijeiras 796282086c Merge branch 'ent-11639-15813-neflow-tener-2-fuentes-de-datos-a-monitorizar' into 'develop'
Ent 11639 [#15813] Neflow: Tener 2 fuentes de datos a monitorizar

See merge request artica/pandorafms!6577
2023-10-19 14:23:23 +00:00
Daniel Cebrian b1b7a1e57d #10194 fixed acl in view 2023-10-19 16:18:36 +02:00
Daniel Cebrian 8259f4a503 #11639 fixed router_ip in netflow 2023-10-19 10:58:30 +02:00
Jonathan 42aa751d29 #12286 fix issue logout public link visual console 2023-10-19 10:53:20 +02:00
Daniel Cebrian 8aa1e88317 #12191 optimized command netflow and sflow 2023-10-18 19:02:27 +02:00
Rafael Ameijeiras 2451eaff62 Merge branch 'ent-12073-consola-sonora-no-funciona-si-la-pestana-se-minimiza' into 'develop'
Ent 12073 consola sonora no funciona si la pestana se minimiza

See merge request artica/pandorafms!6495
2023-10-17 12:25:58 +00:00
Daniel Cebrian d54a6faede #10194 adjust bars 24 hrs in events and changed numbers 2023-10-16 20:47:47 +02:00
Daniel Cebrian 9237e4038a Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-10-16 17:10:33 +02:00
Rafael Ameijeiras 2c76e30591 Merge branch 'ent-11075-cambiar-apostrofe-en-apartado-de-creacion-de-mapas-de-red' into 'develop'
Ent 11075 cambiar apostrofe en apartado de creacion de mapas de red

See merge request artica/pandorafms!6510
2023-10-16 10:07:13 +00:00
miguel angel rasteu 5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
Daniel Cebrian a02482ac5d #10194 added links 2023-10-10 15:15:43 +02:00
miguel angel rasteu 133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
Daniel Cebrian 9b675868b9 Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-10-09 16:43:25 +02:00
miguel angel rasteu 27bee15d50 #12172 Change truncate event name limit to description_size_text 2023-10-04 12:56:28 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-10-03 13:11:09 +00:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
Rafael Ameijeiras b0d12c8a18 Merge branch 'ent-12081-añadir-el-lapso-de-tiempo-none-para-el-filtro-de-los-informes-en-la-vista-HTML-por-defecto' into 'develop'
Ent 12081 añadir el lapso de tiempo none para el filtro de los informes en la vista html por defecto

See merge request artica/pandorafms!6496
2023-10-02 11:23:35 +00:00
Daniel Cebrian b8df74dace Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-09-28 16:22:58 +02:00
Diego Muñoz-Reja b84ffc124b Merge branch 'ent-12066-eventos-que-no-muestran-los-comentarios' into 'develop'
fix show comment events ticket pandora_enterprise#12066

See merge request artica/pandorafms!6488
2023-09-28 14:06:30 +00:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
2023-09-28 10:05:15 +00:00
miguel angel rasteu a4345c8ae4 #11075 Fix apostrophe 2023-09-27 16:08:55 +02:00
Daniel Cebrian 62d501e6d5 #10194 sections Alerts and Events 2023-09-27 13:30:56 +02:00
Rafael Ameijeiras 03700d2653 Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop'
refactor cluster view pandora_enterprise#12032

See merge request artica/pandorafms!6476
2023-09-26 15:15:27 +00:00
Rafael Ameijeiras a69550c733 Merge branch 'ent-12071-16277-columna-secondary-groups-en-la-vista-de-inventario-no-muestra-nada' into 'develop'
Fix inventory view agent secondary groups

See merge request artica/pandorafms!6456
2023-09-26 15:14:47 +00:00
Jorge Rincon db7a5e121d Add the None option to the date filter to prioritize the period of the report items. 2023-09-25 17:10:43 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
miguel angel rasteu 550bd0e6ba #12073 Add tip 2023-09-25 15:39:48 +02:00
Rafael Ameijeiras 60c3bb456a Merge branch 'ent-12099-cabecera-de-filtros-descuadrada-en-informes-vista-html' into 'develop'
Ent 12099 cabecera de filtros descuadrada en informes vista html

See merge request artica/pandorafms!6480
2023-09-25 11:22:08 +00:00
miguel angel rasteu 4b999b79d3 #12099 Fix filter position 2023-09-25 10:57:46 +02:00
Diego Muñoz-Reja 5079cb9256 Merge branch 'ent-12044-consola-acustica-rota-en-version-open' into 'develop'
Ent 12044 consola acustica rota en version open

See merge request artica/pandorafms!6469
2023-09-25 08:23:34 +00:00
miguel angel rasteu 9a5a1f02bf #12099 Fix filter position 2023-09-25 09:55:55 +02:00
Rafael Ameijeiras b1c3eb7f3c Merge branch 'ent-12100-graph-analysis-no-puedo-exportar-a-grafica-combinada' into 'develop'
Ent 12100 graph analysis no puedo exportar a grafica combinada

See merge request artica/pandorafms!6483
2023-09-25 07:11:48 +00:00
miguel angel rasteu f2bda1e58d #12099 Fix filter position 2023-09-22 13:05:29 +02:00
daniel c6a04d5d8f fix show comment events ticket pandora_enterprise#12066 2023-09-22 12:56:01 +02:00
Diego Muñoz-Reja 576ee1bf37 Merge branch 'ent-11965-security-hardening-console-vistas-estaticas' into 'develop'
Ent 11965 Security hardening: Console - Vistas estaticas

See merge request artica/pandorafms!6370
2023-09-21 14:57:06 +00:00
miguel angel rasteu e637866f72 #12100 Fix custom graph 2023-09-21 16:11:58 +02:00