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

517 Commits

Author SHA1 Message Date
Enrique Martin 9733ac8717 Set consecutive keys for dashboard items array. Fix JS error when printing imported dashboard 2024-02-13 11:53:35 +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
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
Daniel Maya 31acb0964a #12026 Fixed configuration 2024-01-15 11:18:31 +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 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 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 Maya a008c7486c #12026 Fixed widget 2023-12-14 17:28:34 +01: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
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 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 7b6c14974d #12573 fixed number of cells in list dashboard 2023-12-13 10:34:46 +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
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
Rafael Ameijeiras 0957a87dcb Merge branch 'ent-11705-15916-campo-editable-en-vista-de-eventos' into 'develop' 
Ent 11705 15916 campo editable en vista de eventos

See merge request artica/pandorafms!6486
 2023-11-30 09:18:28 +00:00
Jonathan 75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
Daniel Cebrian c0218ad75c Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-11-29 15:45:07 +01:00
Rafael Ameijeiras 2e0d732eb9 Merge branch 'ent-12498-widget-top-n-of-agent-modules-no-muestra-resultados-de-todos-los-agentes' into 'develop' 
Ent 12498 Widget TOP N of Agent Modules no muestra resultados de TODOS los agentes

See merge request artica/pandorafms!6695
 2023-11-29 14:22:48 +00:00
Jonathan f50dade117 #12533 send events groupid widget 2023-11-29 15:08:22 +01:00
miguel angel rasteu 64b612faea #11494 Add tip and fix MTRS bug 2023-11-29 09:40:34 +01:00
alejandro.campos@artica.es 7240bbf934 implement demo data load 2023-11-29 09:00:45 +01:00
miguel angel rasteu d096f3f9ea Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-11-29 08:44:08 +01:00
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +01:00
daniel f6f0f15731 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
	pandora_console/include/styles/pandora.css
 2023-11-28 08:29:10 +01:00
Matias Didier 3b2c5237d1 Merge branch 'ent-12036-error-en-el-nombre-de-la-copia-de-un-dashboard-cualquiera' into 'develop' 
Ent 12036 error en el nombre de la copia de un dashboard cualquiera

See merge request artica/pandorafms!6457
 2023-11-28 07:09:11 +00:00
Matias Didier b47b076cf1 Merge branch 'ent-1205-projection-graph-se-inventa-la-grafica-a-veces' into 'develop' 
Ent 1205 projection graph se inventa la grafica a veces

See merge request artica/pandorafms!6435
 2023-11-28 07:08:36 +00:00
Rafael Ameijeiras 67700a1ea2 Merge branch 'ent-12083-open-inventory-widget-no-carga' into 'develop' 
Ent 12083 open inventory widget no carga

See merge request artica/pandorafms!6506
 2023-11-27 14:46:47 +00:00
Rafael Ameijeiras 6e46875721 Merge branch 'ent-12208-desplegable-styles-de-widget-panel-with-a-message' into 'develop' 
Ent 12208 desplegable styles de widget panel with a message

See merge request artica/pandorafms!6549
 2023-11-27 14:39:38 +00:00
Rafael Ameijeiras 25152e27f8 Merge branch 'ent-12082-error-al-copiar-widget-de-inventario' into 'develop' 
Ent 12082 error al copiar widget de inventario

See merge request artica/pandorafms!6503
 2023-11-27 14:38:33 +00:00
Daniel Cebrian 09708255aa Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-11-27 13:34:33 +01:00
Rafael Ameijeiras 95cf2a2654 Merge branch 'ent-12268-dashboard-widget-de-eventos-no-se-puede-clickar' into 'develop' 
Ent 12268 dashboard widget de eventos no se puede clickar

See merge request artica/pandorafms!6620
 2023-11-27 12:05:52 +00:00