tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-31 14:48:35 +02:00
Code Issues Packages Projects Releases Wiki Activity
34,400 Commits 34 Branches 30 Tags
Commit Graph

317 Commits

Author SHA1 Message Date
Daniel Cebrian
90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Daniel Cebrian
64cc261483 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 16:48:47 +01:00
Daniel Maya
0e4d423825 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-13 15:17:18 +01:00
daniel
503a1b2c22 Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados 
Conflicts:
	pandora_console/include/lib/Dashboard/Widget.php
 2023-03-13 10:43:38 +01:00
daniel
80c81daafa Merge remote-tracking branch 'origin/develop' into ent-985t push 
9-nuevos-widgets-para-mostrar-datos-en-dashboard-avg-sum-max-min

Conflicts:
	pandora_console/operation/agentes/estado_agente.php
 2023-03-13 09:23:53 +01:00
Daniel Maya
030a37a5da Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-10 12:19:00 +01:00
Pablo Aragon
4ebe7ee790 9680-Conflict 2023-03-10 09:38:55 +01:00
Daniel Cebrian
3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Jose Gonzalez
5ecc3470e2 Tree View in dashboard minor fixes 2023-03-06 23:48:06 +01:00
Pablo Aragon
daf179f1f6 Conflit resolved 2023-03-06 08:32:28 +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
Daniel Cebrian
08fb4e3396 #10324 fixed delete element in favmenu 2023-02-27 10:07:35 +01:00
Daniel Cebrian
728991ad9a #10324 delete fav menu when delete element 2023-02-24 13:36:13 +01:00
Daniel Maya
d4f6baa9bb #8642 Added heatmap widget 2 2023-02-21 15:06:58 +01:00
Daniel Maya
6efaa2bbc6 #8642 Added heatmap widget 2023-02-21 15:06:15 +01:00
Jonathan
005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Pablo Aragon
0125ba742b 9680-Create widget ModulesByStatus 2023-02-15 11:42:50 +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
Pablo Aragon
b439ed684e 9859-Widget AvgSumMaxMinModule 2023-02-10 10:31:41 +01:00
Pablo Aragon
f35acde8eb 9680-Create widget ModulesByStatus 2023-02-09 10:37:12 +01:00
Pablo Aragon
971fc84a47 9680-Create widget ModulesByStatus 2023-02-09 10:12:59 +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
Calvo
63806556de Fix user dashboard homescreen permissions 2023-01-24 10:12:37 +01: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
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
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
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
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