tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,466 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

5766 Commits

Author SHA1 Message Date
Daniel Maya 4c368e5da5 #12344 Fixed filter 3 2023-11-02 12:33:30 +01:00
Daniel Maya ed1ae83770 #12344 Fixed log source 2023-10-30 15:15:53 +01:00
Jorge Rincon ad81b26556 Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-10-30 10:20:31 +01:00
Jorge Rincon 84b9ac14fb #8365Added viewer report for ncm backups 2023-10-30 10:18:29 +01:00
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
Jonathan c01af3e9b6 Merge branch 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-10-30 08:37:37 +01:00
Jorge Rincon 407a505a3e #8365 Added reports for ncm backups. 2023-10-27 14:32:48 +02:00
daniel 04a8717aed Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
 2023-10-25 15:58:10 +02:00
daniel 868700f9f1 add sliced mode simple graph reports and CV pandora_enterprise#9640 2023-10-25 15:55:54 +02: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 a862a8018c #11126 added token in config agent and setup 2023-10-24 18:02:14 +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 490e39c2d8 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-24 13:43:31 +02:00
daniel d8dfaf0fe3 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-10-23 17:02:51 +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
Calvo fdb800c712 Fix upload file function filter by extension. Fix mib uploader only upload .mib file 2023-10-20 13:43:28 +02: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
daniel 6ad9b27df8 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-10-20 10:08:20 +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
daniel 4fb7e1719b add periodicity graph pandora_enterprise#9640 2023-10-18 12:49:47 +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
miguel angel rasteu 7b443414ca #12137 Fix graph events height 2023-10-17 09:52:56 +02:00
miguel angel rasteu 1c609374a8 #12134 Count total modules 2023-10-17 09:27:53 +02:00
miguel angel rasteu c00445eab0 #121773 Fix module name in events view 2023-10-17 09:05:22 +02:00
miguel angel rasteu be99b512e2 #12137 Fix events graph 2023-10-17 08:41:06 +02: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
Daniel Cebrian 2a4f8ce646 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-16 16:56:29 +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
Daniel Cebrian 533201197a #11126 new view vulnerabilities scanner 2023-10-13 12:25:25 +02:00
miguel angel rasteu 5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
miguel angel rasteu f058ec5df8 #12213 Fix warp update notification 2023-10-11 08:12:55 +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
daniel db6f53760e Merge remote-tracking branch 'origin/develop' into ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged 2023-10-06 13:04:04 +02:00
Daniel Cebrian 2228011812 #11126 new view vulnerability scanner 2023-10-04 17:37:42 +02:00
miguel angel rasteu 09cae778c5 #12153 Create event list graph 2023-10-04 16:28:40 +02:00
miguel angel rasteu 27bee15d50 #12172 Change truncate event name limit to description_size_text 2023-10-04 12:56:28 +02:00
miguel angel rasteu 874cb9c52a #12153 Create button and ajax request 2023-10-04 12:41:23 +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
miguel angel rasteu f27d4176ea #12137 Fix OS version 2023-10-03 10:58:59 +02:00
miguel angel rasteu 2b416382a4 #12138 Fix agent main view 2023-10-03 10:26:57 +02:00
miguel angel rasteu 384a66dc0d #12137 Fix refact 2023-10-03 09:35:10 +02:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
miguel angel rasteu 3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +02:00
miguel angel rasteu 340288d785 #12137 visual refactoring for main agent view 2023-10-02 15:25:24 +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
miguel angel rasteu 4d345ab74d #12159 Fix search agent width _ 2023-10-02 12:00:13 +02: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
Jonathan 6db13cc55a merge conflict solution 2023-09-28 13:14:49 +02: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
Jonathan 4eb0e69e29 #11763 new regex filter events 2023-09-28 10:11:55 +02: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
Jorge Rincon 32c47c97ed The XSS vulnerability is corrected by adding entities to the Subject field 2023-09-25 12:29:25 +02:00
daniel 2e63546550 add new type search status events not in process pandora_enterprise#11760 2023-09-25 11:29:38 +02:00
miguel angel rasteu 4b999b79d3 #12099 Fix filter position 2023-09-25 10:57:46 +02:00
Jonathan e5c5f91576 #11705 change name event_custom_id 2023-09-25 10:32:23 +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
Jonathan 79fe89c3c5 #11705 new custom_field tevento 2023-09-22 12:24:15 +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
miguel angel rasteu d7f774bf57 #12099 Fix filter header 2023-09-21 13:12:11 +02:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
miguel angel rasteu 98bdee7037 #12079 Apply the filter automatic 2023-09-21 09:24:35 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
Rafael Ameijeiras 2f95504038 Merge branch 'ent-12001-modulos-de-inventario-no-se-muestran' into 'develop' 
Ent 12001 Módulos de inventario no se muestran

See merge request artica/pandorafms!6465
 2023-09-20 13:49:07 +00:00
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
Daniel Cebrian 73d179e52f #12001 added autoselect module in inventory 2023-09-20 12:14:55 +02:00
Jonathan fcefe5a225 #12044 fix acoustic console open error 500 2023-09-20 12:07:19 +02:00
Daniel Cebrian 32b7a103eb #12001 fixed list modules when select agent 2023-09-19 17:26:36 +02:00
Daniel Cebrian 1465400fb6 #12001 fixed filter in inventary 2023-09-19 16:22:58 +02:00
miguel angel rasteu d83c1a81d2 #12052 Fix filter alter detail view 2023-09-19 13:50:06 +02:00
Daniel Cebrian b85d622d51 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-18 16:52:57 +02:00
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
Daniel Rodriguez 6ecd8ca899 Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop' 
Draft: Ent 10065 post filtros de eventos privados

See merge request artica/pandorafms!6318
 2023-09-18 07:55:18 +00:00
Rafael Ameijeiras b568085841 Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop' 
not show edition buttons of alert detail pandora_enterprise#12035

See merge request artica/pandorafms!6444
 2023-09-18 07:22:13 +00:00
Daniel Cebrian 25e0834db0 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-15 14:57:18 +02:00
Calvo 9394446a1e Fix inventory view agent secondary groups 2023-09-15 13:46:29 +02:00
Daniel Cebrian 2844dfd4f0 #11807 fixed export csv in hardening, fixed interval time in exports report and fixed modal error in reports 2023-09-15 13:34:07 +02:00
daniel 09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
miguel angel rasteu 91aee79ab2 #12037 Resolve conflicts 2023-09-12 15:07:00 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel 16f1d80919 not show edition buttons of alert detail pandora_enterprise#12035 2023-09-12 12:30:52 +02:00
Rafael Ameijeiras bab81b08e2 Merge branch 'ent-10676-14689-aumento-agentes-en-monitors-view' into 'develop' 
Ent 10676 14689 aumento agentes en monitors view

See merge request artica/pandorafms!6426
 2023-09-12 07:23:33 +00:00
miguel angel rasteu fddf204a1b #10676 Fix module text size 2023-09-11 15:18:25 +02:00
Rafael Ameijeiras 0d0380f37d Merge branch 'ent-12017-icono-para-ver-informe-cambia' into 'develop' 
Ent 12017 icono para ver informe cambia

See merge request artica/pandorafms!6431
 2023-09-11 11:35:39 +00:00
Rafael Ameijeiras 5aa2c5e0e8 Merge branch 'ent-12012-Busqueda-de-agentes-en-version-Community-no-funciona' into 'develop' 
fix agent search in community versoin

See merge request artica/pandorafms!6419
 2023-09-11 11:34:30 +00:00
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
miguel angel rasteu 95f84b975c #12017 Fix see details icon 2023-09-11 10:40:39 +02:00
miguel angel rasteu 99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +02:00
Rafael Ameijeiras 0c6aaa6723 Merge branch 'ent-11993-user-notifications-esta-roto' into 'develop' 
Ent 11993 user notifications esta roto

See merge request artica/pandorafms!6412
 2023-09-11 07:15:38 +00:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/functions_menu.php
 2023-09-08 13:11:52 +02:00
Matias Didier ef544fffbb Merge branch 'ent-11996-bugs-en-projection-graphs' into 'develop' 
Ent 11996 bugs en projection graphs

See merge request artica/pandorafms!6421
 2023-09-08 10:41:14 +00:00
Jorge Rincon 142624fdd5 Added display of the default Netflow starting from the last hour 2023-09-08 11:17:57 +02:00
miguel angel rasteu 9cdc7273a6 #10676 increase chars in agents name in monitor view and truncate at the end 2023-09-08 10:42:40 +02:00
Rafael Ameijeiras 1014287cba Merge branch 'ent-11801-giss-y-entornos-pesados-desactivar-filtrado-por-defecto-al-acceder-a-vista-de-alertas-y-vista' into 'develop' 
Ent 11801 giss y entornos pesados desactivar filtrado por defecto al acceder a vista de alertas y vista

See merge request artica/pandorafms!6384
 2023-09-08 07:24:18 +00:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
miguel angel rasteu f445066d13 #11679 Fix linked module name 2023-09-07 16:29:18 +02:00
Daniel Cebrian 133c1676c0 Merge branch 'ent-11807-security-hardening-console-informes' into ent-11965-security-hardening-console-vistas-estaticas 2023-09-07 15:28:55 +02:00
Rafael Ameijeiras 726830b92e Merge branch 'ent-11988-titulo-incorrecto-a-la-hora-de-crear-editar-un-modulo-de-red' into 'develop' 
Ent 11988 titulo incorrecto a la hora de crear editar un modulo de red

See merge request artica/pandorafms!6401
 2023-09-07 12:40:32 +00:00
Pablo Aragon 18d4f700f4 11801-Change message no filter in Monitor status 2023-09-07 13:54:41 +02:00
miguel angel rasteu 57fc1aaf85 #11993 Clean traces 2023-09-07 13:04:45 +02:00
miguel angel rasteu 2104823b68 #11988 Clean traces 2023-09-07 12:50:25 +02:00
miguel angel rasteu c7618be8d0 #11988 Fix snmp browser title 2023-09-07 12:27:28 +02:00
miguel angel rasteu b876928350 #Change notifications labels 2023-09-07 12:02:07 +02:00
Pablo Aragon 87c02fd0a7 11801-Resolve conflict 2023-09-07 11:08:31 +02:00
miguel angel rasteu a433a78a4c #Fix graph 2023-09-07 10:44:46 +02:00
alejandro.campos@artica.es 03d77613ef fix agent search in community versoin 2023-09-06 17:42:42 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
miguel angel rasteu fd94a4ff69 Merge branch 'develop' into ent-11537-bug-en-cuadros-de-busqueda-con-los-caracteres-2-y-0 2023-09-06 09:54:45 +02:00
Rafael Ameijeiras e3a5fe0fb6 Merge branch 'ent-10602-Inventory-Widget' into 'develop' 
Ent 10602 inventory widget

See merge request artica/pandorafms!6301
 2023-09-06 07:08:19 +00:00
Matias Didier 96c722b816 Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop' 
Ent 9814 nuego item graficas de capacity planning en dashboard

See merge request artica/pandorafms!6382
 2023-09-06 06:56:59 +00:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
alejandro.campos@artica.es c21fba3aec minor fix 2023-09-05 13:45:02 +02:00
miguel angel rasteu 4911d84c76 #11993 Fix configration users notification 2023-09-05 11:52:16 +02:00
miguel angel rasteu b8e8a16e7d #11537 Fix search with space entitites 2023-09-05 10:11:15 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop' 
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
 2023-09-05 07:50:45 +00:00
daniel a059f18b4b ITSM pandora_enterprise#11471 2023-09-04 16:36:58 +02:00
miguel angel rasteu bf4ef92610 #11511 Move tools from operation to management 2023-09-04 13:44:44 +02:00
miguel angel rasteu 3af1981b93 #11510 Fix agent filter on inventory view 2023-09-04 13:21:57 +02:00
miguel angel rasteu 4d69b10a8f #11988 Fix get_parameter 2023-09-04 13:01:34 +02:00
Jorge Rincon ba1a3da03a #10065 fixed checkbox switch style 2023-09-04 10:03:53 +02:00
Rafael Ameijeiras 6e60eeb09b Merge branch 'ent-11490-nuevo-widget-group-status-map' into 'develop' 
Ent 11490 Nuevo widget: group status map

See merge request artica/pandorafms!6252
 2023-09-04 07:05:49 +00:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Gorka Sanchez 7dcb38f382 Merge branch 'ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios' into 'develop' 
Ent 11821 error sql en vista de eventos al agregar columna de comentarios

See merge request artica/pandorafms!6359
 2023-09-01 09:24:10 +00:00
Pablo Aragon 4d3b558e97 11801-Monitors detail/view Start disabled (enable on filter) 2023-09-01 09:37:16 +02:00
Pablo Aragon 9010d079d3 11801-Datatables add parameter Start disabled (enable on filter) 2023-08-31 14:58:47 +02:00
Jonathan 67963100b0 #11973 reload vsconsole on copy elements 2023-08-31 14:57:46 +02:00
Jonathan 89a1dd1e9f #11973 reload vsconsole on copy elements 2023-08-31 14:39:20 +02:00
Jonathan 1e22d473e6 #9814 projection graphs - module view & dashboard 2023-08-31 13:42:52 +02:00
miguel angel rasteu c2e6dd378d #11206 Fix buttons 2023-08-31 13:36:26 +02:00
miguel angel rasteu 2c62de02f7 Fix conflict 2023-08-31 12:49:48 +02:00
Gorka Sanchez 6102cb5015 Merge branch 'ent-11423-nueva-herramienta-graph-analytics' into 'develop' 
Ent 11423 nueva herramienta graph analytics

See merge request artica/pandorafms!6327
 2023-08-31 10:30:27 +00:00
Gorka Sanchez 66eaf39645 Merge branch 'ent-10637-mejora-informe-grupo' into 'develop' 
Ent 10637 mejora informe grupo

See merge request artica/pandorafms!6206
 2023-08-31 06:47:57 +00:00
Gorka Sanchez d2b768c8cf Merge branch 'ent-9160-selector-de-elementos-multiple-en-consola-visual' into 'develop' 
Ent 9160 selector de elementos multiple en consola visual

See merge request artica/pandorafms!6367
 2023-08-31 06:46:16 +00:00
Gorka Sanchez 5cc63390e0 Merge branch 'ent-11817-autorefresco-en-vista-de-mapas-de-red' into 'develop' 
Ent 11817 autorefresco en vista de mapas de red

See merge request artica/pandorafms!6368
 2023-08-31 06:35:11 +00:00
Matias Didier a3c8657853 Merge branch 'ent-11958-16155-icono-de-recuperacion-de-alerta-en-ultimos-eventos-de-la-vista-tactica-gigante' into 'develop' 
Ent 11958 16155 icono de recuperacion de alerta en ultimos eventos de la vista tactica gigante

See merge request artica/pandorafms!6371
 2023-08-29 13:12:24 +00:00
Daniel Cebrian 1fa0bc0ab1 #11965 new section security in menu 2023-08-29 15:09:41 +02:00
Pablo Aragon a27f5e129a 11958-Fix Recover alert icon size 2023-08-29 12:35:06 +02:00
Pablo Aragon c967211830 11958-Fix Recover alert icon size 2023-08-29 12:33:35 +02:00
Jonathan 84bb4780ca #10639 new datepicker style and save filter 2023-08-29 12:17:41 +02:00
Daniel Cebrian dee5667783 Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-29 10:57:43 +02:00
Daniel Maya 287848b71c #9160 Added multi selector 2023-08-29 08:58:19 +02:00
Pablo Aragon ba964dfb16 11817-Remove Network maps from autorefresh user list 2023-08-29 08:52:50 +02:00
Jorge Rincon 797b24af86 #10065 Added switch to filter create/edit modal. 2023-08-28 13:54:35 +02:00
Pablo Aragon cd430f9f3f 11952-Fix filters in List of latest events 2023-08-28 12:27:45 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
Pablo Aragon d866848481 11423-Graph analytics. Remove Filter None from export and share 2023-08-25 12:38:58 +02:00
miguel angel rasteu f5d20dc8eb #11206 Fix custom field view 2023-08-25 12:20:07 +02:00
Pablo Aragon 28316e25c3 11423-Graph analytics. Remove Group None from export filter 2023-08-25 10:33:32 +02:00
miguel angel rasteu 1afed9f262 Merge branch 'develop' into ent-11206-anadir-la-custom-field-view-de-la-meta-a-los-nodos 2023-08-25 10:13:43 +02:00
Pablo Aragon 9271dc33f1 11821-Events not sort by comments 2023-08-24 14:43:05 +02:00
miguel angel rasteu bb3a45050f Merge branch 'develop' into ent-10637-mejora-informe-grupo 2023-08-24 12:38:23 +02:00
Pablo Aragon 670cf7d9a7 11423-Graph analytics. Remove graphs & several changes 2023-08-24 12:27:06 +02:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
daniel dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Pablo Aragon c0933e8b15 11423-Graph analytics 2023-08-23 11:51:29 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' 
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
 2023-08-23 05:56:19 +00:00
Pablo Aragon bfa09367d4 11423-Graph analytics. Share function 2023-08-22 15:28:05 +02:00
miguel angel rasteu 330f36a3cf Fix group view 2023-08-22 13:23:17 +02:00
miguel angel rasteu feac240905 #10637 Resolve conflicts 2023-08-22 11:49:23 +02:00
miguel angel rasteu 0194fbaa59 #11206 Fix custom field view 2023-08-22 11:16:17 +02:00
alejandro.campos@artica.es 5624b8256c several changes 2023-08-22 10:29:58 +02:00
Pablo Aragon ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +02:00
daniel 5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
miguel angel rasteu 817c3223be #11206 Fix custom field view 2023-08-21 15:11:13 +02:00
Rafael Ameijeiras 4b10cd4216 Merge branch 'ent-10946-enlaces-filtrando-por-estado-en-widget-general-group-status' into 'develop' 
Ent 10946 enlaces filtrando por estado en widget general group status

See merge request artica/pandorafms!6225
 2023-08-21 11:18:14 +00:00
Rafael Ameijeiras 82389ddf2d Merge branch 'ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento' into 'develop' 
Ent 10870 [#15385] Limpiar eventos desde la vista detallada de evento

See merge request artica/pandorafms!6174
 2023-08-21 11:10:35 +00:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
miguel angel rasteu e96cb41992 #11206 Fix css conflict 2023-08-21 09:10:51 +02:00
miguel angel rasteu a251046452 #11206 Fix conflict 2023-08-21 08:36:42 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02:00
Rafael Ameijeiras dbd90d79a7 Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop' 
Ent 10344 Conexion con el servidor se ha perdido

See merge request artica/pandorafms!6228
 2023-08-21 05:58:32 +00:00
Daniel Cebrian dd5a4887a2 #10870 fixed change status from event 2023-08-18 14:14:51 +02:00
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
Rafael Ameijeiras 52d37be6c9 Merge branch 'ent-10850-meter-la-vista-actual-de-la-vista-detalle-de-agentes-en-el-sistema-de-favoritos' into 'develop' 
Ent 10850 meter la vista actual de la vista detalle de agentes en el sistema de favoritos

See merge request artica/pandorafms!6196
 2023-08-18 06:52:31 +00:00
Rafael Ameijeiras be7489ee93 Merge branch 'ent-9601-14239-Exportar-eventos-en-CSV-no-usa-la-TZ-del-usuario' into 'develop' 
use user configured timezone for event export

See merge request artica/pandorafms!6307
 2023-08-18 06:45:22 +00:00
Daniel Cebrian 5ee4dbee87 #11490 added new widget group status map 2023-08-16 16:11:35 +02:00
Pablo Aragon 63d3745794 11423-Graph analytics. Get filter data (WIP) 2023-08-16 15:12:31 +02:00
Pablo Aragon a10b526938 11423-Graph analytics. Get filter data (WIP) 2023-08-14 15:36:19 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Pablo Aragon 5ed9206f36 11423-Graph analytics. Drag&Drop (WIP) 2023-08-11 13:50:32 +02:00
Pablo Aragon 28b8eeca61 11423-Graph analytics (WIP) 2023-08-10 09:13:48 +02:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Jorge Rincon 3429e0d190 #10065 Added the option to create-edit a private event filter. 2023-08-07 14:43:50 +02:00
Rafael Ameijeiras 3cfa60b38a Merge branch 'ent-11219-fallo-en-traducciones' into 'develop' 
Ent 11219 fallo en traducciones

See merge request artica/pandorafms!6305
 2023-08-04 09:38:01 +00:00
Rafael Ameijeiras 354276fb9e Merge branch 'ent-11822-acoustic-console-no-funciona' into 'develop' 
Ent 11822 acoustic console no funciona

See merge request artica/pandorafms!6309
 2023-08-04 06:42:34 +00:00
Rafael Ameijeiras 0b680568b5 Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' 
Ent 11739 compatibilidad php 8 2 second

See merge request artica/pandorafms!6300
 2023-08-04 06:32:37 +00:00
Jonathan a48c496e14 #11822 fix sound events window 2023-08-03 12:22:35 +02:00
alejandro.campos@artica.es 1fde2ed9b1 use user configured timezone for event export 2023-08-03 11:03:56 +02:00
Rafael Ameijeiras fec85ce8e7 Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' 
Ent 11749 15964 conteo de agentes no aparece en v772

See merge request artica/pandorafms!6266
 2023-08-03 07:04:11 +00:00
miguel angel rasteu fddc709aee #11219 Fix transaltes 2023-08-02 14:48:02 +02:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es 8fdc841254 Merge remote-tracking branch 'origin/develop' into ent-10602-Inventory-Widget 2023-08-01 09:58:37 +02:00
alejandro.campos@artica.es 78e76e1ad3 implemented inventory widget 2023-08-01 09:57:49 +02:00
Jonathan f2328407b1 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-01 09:39:56 +02:00
Daniel Maya ad24712eed resolved conflict 2 2023-07-31 09:48:42 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
Rafael Ameijeiras 6db5b41633 Merge branch 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' into 'develop' 
Ent 10875 15383 limitar ancho y o largo de la linea de los eventos

See merge request artica/pandorafms!6034
 2023-07-31 06:40:38 +00:00
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +02:00
miguel angel rasteu 539dd0ddee #10875 Fix title dialog event 2023-07-28 13:07:04 +02:00
miguel angel rasteu b4ae714af3 #10875 Truncate long string 2023-07-28 10:39:46 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Pablo Aragon 0eb60cf5c8 11174-Timezone iana graph firefox 2023-07-27 11:24:52 +02:00
miguel angel rasteu 2b20b7f8ee #11386 Fix modal 2023-07-27 10:47:51 +02:00
Daniel Rodriguez c2d7c10442 Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop' 
remove legacy visual console

See merge request artica/pandorafms!6140
 2023-07-26 11:09:44 +00:00
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
Rafael Ameijeiras 0e6531b983 Merge branch 'ent-11335-se-pueden-crear-mapas-de-red-con-el-mismo-nombre-y-grupo' into 'develop' 
Ent 11335 Se pueden crear mapas de red con el mismo nombre y grupo

See merge request artica/pandorafms!6143
 2023-07-25 07:53:15 +00:00
Rafael Ameijeiras 25e2183d23 Merge branch 'ent-11726-15939-no-hay-columna-nombre-del-agente' into 'develop' 
Ent 11726 15939 no hay columna nombre del agente

See merge request artica/pandorafms!6240
 2023-07-25 07:51:24 +00:00
Daniel Cebrian 62a70dee2c #11326 added new section and validated if exist plugin 2023-07-24 18:42:27 +02:00
miguel angel rasteu a1965de2ea #11386 Fix sound alert modal 2023-07-24 12:25:06 +02:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +02:00
miguel angel rasteu 80b60eb86f #11749 Fix agent count 2023-07-20 08:43:51 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
daniel c520375c61 ack utimestamp pandora_enterprise#11387 2023-07-19 13:28:53 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
Daniel Maya 5806da78dd #11487 Fixed subgroups 2023-07-18 10:18:30 +02:00
Diego Muñoz-Reja 92623a5837 Merge branch 'ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2' into 'develop' 
Ent 11573 mejora de los informes en vivo de netflow 2

See merge request artica/pandorafms!6142
 2023-07-18 07:30:00 +00:00
daniel a29497f659 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-17 10:52:15 +02:00
Miguel Angel Rasteu c428a7d69c Merge branch 'develop' into 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' 
# Conflicts:
#   pandora_console/operation/events/events.php
 2023-07-17 08:45:28 +00:00
Rafael Ameijeiras de84f5fae9 Merge branch 'ent-11418-cambiar-vista-de-graficas-del-detalle-de-un-agente' into 'develop' 
Ent 11418 cambiar vista de graficas del detalle de un agente

See merge request artica/pandorafms!6014
 2023-07-17 07:53:10 +00:00
daniel a3eefacc80 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-12 16:35:24 +02:00
Daniel Cebrian 0e2d1ee47f #11326 security hardening 2023-07-12 15:54:04 +02:00
miguel angel rasteu 2af618b765 #11726 Fix alert status column name agent 2023-07-12 14:11:00 +02:00
Diego Muñoz-Reja a7c0866be0 Merge branch 'ent-11293-lista-de-reportes-en-metaconsola' into 'develop' 
Ent 11293 lista de reportes en metaconsola

See merge request artica/pandorafms!5952
 2023-07-12 07:16:35 +00:00
Rafael Ameijeiras a8d8676422 Merge branch 'ent-10976-busqueda-rapida-agentes-pasar-a-datatables' into 'develop' 
Ent 10976 busqueda rapida agentes pasar a datatables

See merge request artica/pandorafms!5834
 2023-07-12 06:04:56 +00:00
miguel angel rasteu e3496a44b6 #11206 Add custom field view in nodes 2023-07-11 16:52:39 +02:00
Daniel Cebrian 0a34d06603 #10344 changed message in popup conexion check 2023-07-11 11:35:57 +02:00
Jonathan 183e11a640 #10976 & correction on search agents 2023-07-11 10:24:50 +02:00
miguel angel rasteu 8bcd7cae26 #10946 redirect to tree view in metaconsole 2023-07-11 09:56:46 +02:00
daniel 524bb7fdbb Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-11 08:26:20 +02:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
Gorka Sanchez 374cad5d8d Merge branch 'ent-11312-15642-problemas-url-publica-de-visual-consoles' into 'develop' 
Ent 11312 15642 problemas url publica de visual consoles

See merge request artica/pandorafms!5963
 2023-07-10 14:12:53 +00:00
Jonathan 27222a1731 #10976 fix minor error 2023-07-10 13:59:33 +02:00
Jonathan fd9a30d0a3 #10639 datetime range reporting 2023-07-10 11:33:10 +02:00
Jonathan 111ae5c0ba #10639 datetime range reporting 2023-07-10 09:20:15 +02:00
miguel angel rasteu 14819e045e #11649 Fix event widget 2023-07-10 09:04:07 +02:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
Gorka Sanchez cd668590bd Merge branch 'ent-11567-ventana-about' into 'develop' 
Ent 11567 ventana about

See merge request artica/pandorafms!6138
 2023-07-07 07:24:44 +00:00
Jonathan 178f04945f #10976 fix bug search agents global search 2023-07-07 09:21:52 +02:00
miguel angel rasteu 444dbb4599 #11386 Fix modal event sound 2023-07-06 13:15:45 +02:00
Jonathan 82cac02da9 Merge branch 'develop' into ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2 2023-07-06 12:37:16 +02:00
Gorka Sanchez 8fd3ed6650 Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop' 
Ent 9478 creacion y edicion directa de alertas desde metaconsola

See merge request artica/pandorafms!5806
 2023-07-06 09:44:33 +00:00
Daniel Cebrian d993674c12 Merge branch 'develop' into ent-11567-ventana-about 2023-07-06 11:30:45 +02:00
Daniel Cebrian 951a468282 #11418 fixed id modules order in view graphs 2023-07-06 11:26:29 +02:00
Jonathan d6df9ed38e #10639 new datepicker style and filters 2023-07-05 14:38:59 +02:00
Matias Didier 3ad880cdec Merge branch 'ent-10627-no-se-pueden-crear-mensajes-para-un-grupo' into 'develop' 
Ent 10627 no se pueden crear mensajes para un grupo

See merge request artica/pandorafms!5874
 2023-07-05 12:36:06 +00:00
Gorka Sanchez 7dea46c634 Merge branch 'ent-11093-reticula-en-consola-visual' into 'develop' 
Ent 11093 reticula en consola visual

See merge request artica/pandorafms!6056
 2023-07-05 09:54:35 +00:00
Matias Didier 5dee7f6d28 Merge branch 'ent-11625-los-iconos-del-tipo-de-evento-son-todo-cubos-de-colores' into 'develop' 
Ent 11625 los iconos del tipo de evento son todo cubos de colores

See merge request artica/pandorafms!6150
 2023-07-05 07:25:55 +00:00
Matias Didier af2def1a62 Merge branch 'ent-11205-vista-de-incidencias-con-estilo-no-homogeneo' into 'develop' 
Ent 11205 vista de incidencias con estilo no homogeneo

See merge request artica/pandorafms!5908
 2023-07-04 14:02:13 +00:00
Jonathan e9064dfd2f Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-04 14:09:15 +02:00
Jonathan a385ff93a3 #9478 creation alerts to nodes on metaconsole 2023-07-04 12:47:04 +02:00
miguel angel rasteu 138fa636ad #10637 Change group view 2023-07-04 11:06:49 +02:00
Gorka Sanchez 9427ba68e0 Merge branch 'ent-11314-vista-detalle-de-agente-cajas-colapsadas-por-defecto-si-no-hay-informacion' into 'develop' 
Ent 11314 vista detalle de agente cajas colapsadas por defecto si no hay informacion

See merge request artica/pandorafms!5969
 2023-07-04 08:53:12 +00:00
Jonathan 11bc45ff02 #11625 fix style event type icon 2023-07-03 12:13:27 +02:00
Jonathan 1c69208a6a Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola 2023-07-03 10:21:55 +02:00
Jonathan d7a682d48c Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-03 09:50:59 +02:00
Gorka Sanchez d7a871ff76 Merge branch 'ent-10563-mejoras-personalizacion-interfaz' into 'develop' 
Ent 10563 mejoras personalizacion interfaz

See merge request artica/pandorafms!6200
 2023-07-03 07:49:25 +00:00
Miguel Angel Rasteu 82f6c6c0da Merge branch 'develop' into 'ent-10563-mejoras-personalizacion-interfaz' 
# Conflicts:
#   pandora_console/godmode/agentes/module_manager.php
 2023-07-03 07:45:32 +00:00
Miguel Angel Rasteu 6a161a1af8 Merge branch 'develop' into 'ent-11474-inventario-all-no-se-muestra-en-metaconsola' 
# Conflicts:
#   pandora_console/include/functions_inventory.php
 2023-07-03 07:44:19 +00:00
Gorka Sanchez ffc4f04989 Merge branch 'ent-11628-no-carga-el-total-amount-of-events-correctamente-si-hay-varios-widget-tactical-view' into 'develop' 
Ent 11628 no carga el total amount of events correctamente si hay varios widget tactical view

See merge request artica/pandorafms!6154
 2023-07-03 07:42:21 +00:00
Jonathan 5f8c2f1653 #11628 merge conflict solution 2023-07-03 09:34:04 +02:00
Gorka Sanchez 6a8a0e8b6f Merge branch 'ent-11469-selector-de-modulos-comunes-en-wizard-de-servicios-no-anade-nada' into 'develop' 
Ent 11469 selector de modulos comunes en wizard de servicios no anade nada

See merge request artica/pandorafms!6047
 2023-07-03 07:33:05 +00:00
Gorka Sanchez 28f99d2c27 Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop' 
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres

See merge request artica/pandorafms!5713
 2023-06-30 11:39:50 +00:00