Commit Graph

457 Commits

Author SHA1 Message Date
Jose Gonzalez 5ecc3470e2 Tree View in dashboard minor fixes 2023-03-06 23:48:06 +01:00
daniel 5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Jose Gonzalez e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
daniel f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
2023-03-06 08:09:29 +01:00
Jimmy Olano 6b55c65330 Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS.
Ent 10092 14739 peticion de filtro en widget tree view

See merge request artica/pandorafms!5532
2023-03-05 22:56:35 +00:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
daniel a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
Jonathan 005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Pablo Aragon 87c3bee756 9666-New widget Event cardboard 2023-02-15 11:23:36 +01:00
Pablo Aragon feb2f3ffa2 10092-Widget tree view, Not normal status 2023-02-13 15:03:23 +01:00
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +01:00
Rafael Ameijeiras 1ed1b19cd0 Merge branch 'ent-9829-listado-de-dashboards-en-pantalla-de-inicio' into 'develop'
Fix list all private dashboards on user edition

See merge request artica/pandorafms!5320
2023-01-24 11:59:23 +00:00
Calvo 63806556de Fix user dashboard homescreen permissions 2023-01-24 10:12:37 +01:00
Rafael Ameijeiras b0167af928 Merge branch 'ent-10103-cambio-en-vista-de-threeshold-de-clusters' into 'develop'
Ent 10103 cambio en vista de threeshold de clusters

See merge request artica/pandorafms!5390
2023-01-23 15:28:06 +00:00
Calvo 2fc1abc893 Merge remote-tracking branch 'origin/develop' into ent-9829-listado-de-dashboards-en-pantalla-de-inicio 2023-01-18 11:33:21 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Daniel Cebrian acd36289b0 #10103 added module name in A-A THRESHOLDS 2023-01-09 17:17:04 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
Rafael Ameijeiras 96257faf31 Merge branch 'ent-9556-14267-Conteo-y-paginacion-incorrecto-en-vista-de-Dashboards' into 'develop'
fixed count query for admin user

See merge request artica/pandorafms!5348
2022-12-28 11:35:18 +00:00
daniel 5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
alejandro.campos@artica.es 4ee89b5b3e fixed count query for admin user 2022-12-21 13:39:03 +01:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
Daniel Rodriguez cc2da2d4a4 Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop'
implement cluster in open project

See merge request artica/pandorafms!5204
2022-12-21 09:05:01 +00:00
Diego Muñoz-Reja de0efc7f3a Merge branch 'ent-9965-error-sql-en-busqueda-de-widgets' into 'develop'
Fix sql error on widget search

See merge request artica/pandorafms!5323
2022-12-20 15:04:58 +00:00
Rafael Ameijeiras b640b9f7b9 Merge branch 'ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard' into 'develop'
new widget datamatrix pandora_enterprise#8619

See merge request artica/pandorafms!5257
2022-12-19 10:49:45 +00:00
Daniel Barbero b4d306b9b1 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-19 09:38:21 +01:00
alejandro.campos@artica.es 2922276654 minor change 2022-12-16 11:38:40 +01:00
alejandro.campos@artica.es 8f3f8679d5 Merge remote-tracking branch 'origin/develop' into ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open 2022-12-16 11:29:00 +01:00
Daniel Barbero 62aea35d7b fixed js render 2022-12-16 10:38:37 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
Alejandro Campos 960d8be258 Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open'
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
2022-12-15 14:05:27 +00:00
Daniel Barbero 14f548aa3a fixed error format data datamatrix pandora_enterprise#8619 2022-12-13 11:06:42 +01:00
Daniel Barbero 2d638a61cf Merge remote-tracking branch 'origin/develop' into ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard 2022-12-13 09:59:30 +01:00
Calvo 6913f237dc Fix sql error on widget search 2022-12-12 15:48:10 +01:00
Luis Calvo cdd1569364 Fix list all private dashboards on user edition 2022-12-09 09:54:20 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
alejandro.campos@artica.es b4079bd557 fixed query errors 2022-11-30 16:52:40 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
alejandro.campos@artica.es eda1ace809 fix alerts fired widget 2022-11-17 12:46:37 +01:00
jose.gonzalez@pandorafms.com 325bbea8db Agent view fixed and other minor fixes 2022-11-15 08:05:04 +01:00
Daniel Barbero e10455c902 new widget datamatrix pandora_enterprise#8619 2022-11-10 16:10:50 +01:00
Daniel Barbero f273813869 new widget datamatrix pandora_enterprise#8619 2022-11-10 12:05:25 +01:00
Daniel Barbero 4b4f92b11b new widget datamatrix pandora_enterprise#8619 2022-11-08 16:30:25 +01:00
alejandro.campos@artica.es e3d01930b1 minor change 2022-11-07 14:13:04 +01:00
alejandro.campos@artica.es 75fe9dd8d3 fix xss 2022-11-07 11:26:00 +01:00