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

838 Commits

Author SHA1 Message Date
Daniel Cebrian da8769c860 #12509 resolve conflicts 2024-01-19 10:26:09 +01:00
Rafael Ameijeiras 2baef1ccf2 Merge branch 'ent-12553-correccion-de-erratas' into 'develop' 
Ent 12553 Corrección de erratas

See merge request artica/pandorafms!6817
 2024-01-19 08:23:35 +00:00
Matias Didier 6f290f940f Merge branch 'ent-12602-16735-Bug-de-grupos-en-vista-tactica' into 'develop' 
fix tactical item

See merge request artica/pandorafms!6840
 2024-01-18 14:06:38 +00:00
Rafael Ameijeiras edc5354c21 Merge branch 'ent-12696-usuario-de-con-permisos-de-grupo-ve-todas-las-paradas-planificadas-en-la-vista-tactica' into 'develop' 
Ent 12696 usuario de con permisos de grupo ve todas las paradas planificadas en la vista tactica

See merge request artica/pandorafms!6852
 2024-01-18 12:53:02 +00:00
Rafael Ameijeiras f7d5c4d443 Merge branch 'ent-12573-no-se-muestra-el-numero-de-celdas-widgets-en-los-dashboards' into 'develop' 
Ent 12573 No se muestra el número de celdas (widgets) en los Dashboards

See merge request artica/pandorafms!6762
 2024-01-18 12:41:44 +00:00
Rafael Ameijeiras 8a41a04345 Merge branch 'ent-12143-arreglar-mejorar-visualizacion-de-calendarios-y-selectores-de-fecha' into 'develop' 
Ent 12143 arreglar mejorar visualizacion de calendarios y selectores de fecha

See merge request artica/pandorafms!6765
 2024-01-18 11:27:20 +00:00
Rafael Ameijeiras 2b78bdd664 Merge branch 'ent-12026-nuevo-widget-de-inventario-para-dashboard-falta-mostrar-mensaje-inicial-please-configure-this' into 'develop' 
Ent 12026 nuevo widget de inventario para dashboard falta mostrar mensaje inicial please configure this

See merge request artica/pandorafms!6776
 2024-01-18 11:13:49 +00:00
Matias Didier de406f3224 Merge branch 'ent-11329-widget-de-latest-events-no-recoge-grupos-secundarios' into 'develop' 
Ent 11329 Widget de latest events no recoge grupos secundarios

See merge request artica/pandorafms!6818
 2024-01-18 10:16:23 +00:00
Matias Didier 6410ed7a18 Merge branch 'ent-12324-widget-general-group-stats-sale-descentrazo-verticalmente' into 'develop' 
Ent 12324 widget general group stats sale descentrazo verticalmente

See merge request artica/pandorafms!6790
 2024-01-18 08:41:16 +00:00
Jonathan ce00c4b9e5 #12696 fix tactical view error 500 and schedule by group 2024-01-16 17:17:07 +01:00
Daniel Maya 31acb0964a #12026 Fixed configuration 2024-01-15 11:18:31 +01:00
alejandro.campos@artica.es a712610624 fix tactical item 2024-01-10 11:27:43 +01:00
Jonathan 83b25fef31 Merge branch 'develop' into ent-12143-arreglar-mejorar-visualizacion-de-calendarios-y-selectores-de-fecha 2024-01-09 11:37:54 +01:00
Daniel Cebrian 563fe72194 #11329 added secondary group in event list 2023-12-28 11:08:14 +01:00
Daniel Cebrian 5b4531e74f #12553 fixed titles 2023-12-27 17:10:11 +01:00
Calvo 421eb1fe23 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-19 18:59:07 +01:00
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop' 
implement demo data feature

See merge request artica/pandorafms!6606
 2023-12-19 15:40:09 +00:00
Daniel Maya f1f8f40241 #12324 Fixed group status 2023-12-19 15:02:29 +01:00
daniel 855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
 2023-12-19 09:39:24 +01:00
Rafael Ameijeiras a4eed65758 Merge branch 'ent-12200-huevo-de-pascua-efecto-nieve' into 'develop' 
Ent 12200 huevo de pascua efecto nieve

See merge request artica/pandorafms!6675
 2023-12-19 07:56:55 +00:00
Daniel Maya e5b513f018 #12200 Fixed Christmas 2023-12-18 16:44:27 +01:00
Rafael Ameijeiras 2fef90895e Merge branch 'ent-12465-guardia-16501-fallo-en-edicion-de-grupo-ldap' into 'develop' 
Ent 12465 guardia 16501 fallo en edicion de grupo ldap

See merge request artica/pandorafms!6685
 2023-12-18 14:52:25 +00:00
Rafael Ameijeiras e86132a89d Merge branch 'ent-12456-dashboard-widgert-colmena-de-agentes-agent-hive-se-ve-con-con-OS-description-largos' into 'develop' 
Ent 12456 dashboard widgert colmena de agentes agent hive se ve con con os description largos

See merge request artica/pandorafms!6669
 2023-12-18 14:52:02 +00:00
Daniel Maya 0ac20717f1 #12200 resolved conflict 2023-12-18 13:15:42 +01:00
Matias Didier ec24bb3a01 Merge branch 'ent-12198-easter-egg-bienvenida-dinamica' into 'develop' 
Ent 12198 easter egg bienvenida dinamica

See merge request artica/pandorafms!6687
 2023-12-18 11:38:57 +00:00
Daniel Maya 7c0a2b4e97 #12456 Fixed os text style 2 2023-12-18 12:00:14 +01:00
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-18 10:54:27 +00:00
Daniel Maya e6981fb436 #12456 Fixed os text style 2023-12-15 12:59:56 +01:00
daniel 70dd1719db Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-15 09:13:07 +01:00
Daniel Maya a008c7486c #12026 Fixed widget 2023-12-14 17:28:34 +01:00
Rafael Ameijeiras e3d408ea44 Merge branch 'ent-12365-nueva-automonitorizacion-de-logs-erronea' into 'develop' 
Fix opensearch total documents automonitorization

See merge request artica/pandorafms!6773
 2023-12-14 16:05:23 +00:00
daniel ea97bb8f60 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-14 13:27:03 +01:00
Diego Muñoz-Reja 60a2557878 Merge branch 'ent-10116-14775-service-view-widget-no-tiene-filtro-de-grupos-y-recursion' into 'develop' 
Ent 10116 14775 service view widget no tiene filtro de grupos y recursion

See merge request artica/pandorafms!6451
 2023-12-14 11:19:25 +00:00
Calvo 036425ddda Fix opensearch total documents automonitorization 2023-12-14 11:40:26 +01:00
daniel 2890fd3dab Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-14 11:05:29 +01:00
Rafael Ameijeiras c5687ee1fd Merge branch 'ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto' into 'develop' 
fix error empty clusters pandora_enterprise#12511

See merge request artica/pandorafms!6719
 2023-12-13 16:32:17 +00:00
Rafael Ameijeiras 645c2d886a Merge branch 'ent-12390-item-heatmap-se-rompe-al-no-elegir-grupo' into 'develop' 
Ent 12390 item heatmap se rompe al no elegir grupo

See merge request artica/pandorafms!6652
 2023-12-13 12:17:10 +00:00
Jonathan 88784de3ef #12143 fix datepicker dashboard widget hardening 2023-12-13 13:03:08 +01:00
Daniel Cebrian 6e246d5d29 #12509 fixed status agents disabled 2023-12-13 12:04:00 +01:00
Daniel Rodriguez 70d8b344b7 Merge branch 'ent-12176-mejorar-la-captura-de-errores-en-nuevo-discovery-cuando-termine-con-errores' into 'develop' 
Ent 12176 Mejorar la captura de errores en nuevo Discovery cuando termine con errores

See merge request artica/pandorafms!6705
 2023-12-13 10:32:58 +00:00
Daniel Cebrian 7b6c14974d #12573 fixed number of cells in list dashboard 2023-12-13 10:34:46 +01:00
daniel 56f50bf4b0 Merge remote-tracking branch 'origin/develop' into ent-12511-error-handeling-en-los-clusters-no-es-del-todo-correcto 2023-12-13 10:05:07 +01:00
daniel a418673489 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-11 11:09:54 +01:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-05 15:30:06 +00:00
Daniel Cebrian 75720df6fa #12176 fixed empty news board 2023-12-05 13:23:37 +01:00
miguel angel rasteu 6455314f0c Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-12-05 11:16:42 +01:00
daniel 77cf0ce6ca Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-05 08:02:55 +01:00
Rafael Ameijeiras 7a238c34d6 Merge branch 'ent-12533-16681-error-al-aplicar-filtro-de-evento-personalizado-en-widget-list-of-latest-events' into 'develop' 
Ent 12533 16681 error al aplicar filtro de evento personalizado en widget list of latest events

See merge request artica/pandorafms!6716
 2023-12-04 08:11:49 +00:00
miguel angel rasteu 41b92cc55f Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-12-01 10:34:43 +01:00
Jonathan f780d0bd2a #12533 enable event list no group (Default all) 2023-11-30 15:58:39 +01:00