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

372 Commits

Author SHA1 Message Date
Calvo 74b6971c30 Added recursion to widgets Group status and General group status 2022-09-08 18:23:24 +02:00
Daniel Barbero f81ab65d5e fix error pandora_enterprise#9367 2022-08-10 12:20:14 +02:00
Daniel Barbero Martin 770933a2dd fixed history timeout pandora_enterprise#9273 2022-07-27 14:28:50 +02:00
Daniel Rodriguez 958f851af5 Merge branch 'ent-8929-Mejora-en-widget-dasboard-General-group-stats' into 'develop' 
Ent 8929 mejora en widget dasboard general group stats

See merge request artica/pandorafms!4892
 2022-07-19 06:30:27 +00:00
Diego Muñoz-Reja c0705fcce4 Merge branch 'ent-9257-13892-Error-al-mostrar-reporte-sin-datos' into 'develop' 
Ent 9257 13892 error al mostrar reporte sin datos

See merge request artica/pandorafms!5005
 2022-07-06 08:02:21 +00:00
Diego Muñoz-Reja a257f43d49 Merge branch 'ent-8939-Cambiar-comportamiento-de-los-comentarios-en-eventos-rendimiento' into 'develop' 
Ent 8939 cambiar comportamiento de los comentarios en eventos rendimiento

See merge request artica/pandorafms!4889
 2022-07-05 15:44:24 +00:00
Daniel Maya a1aa179031 #9257 Fixed return array 2022-07-05 13:12:29 +02:00
Diego Muñoz-Reja ef48206e7f Merge branch 'ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica' into 'develop' 
Ent 8763 g sanchez anadir filtro de grupos al widget de vista tactica

See merge request artica/pandorafms!4937
 2022-06-30 12:54:40 +00:00
Daniel Barbero Martin a92d50303d fix color tabs and block histogram pandora_enterprise#8621 2022-06-30 14:09:29 +02:00
Daniel Barbero Martin 95fca17fa9 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-30 12:52:49 +02:00
Jimmy Olano 2220125250 Merge branch 'ent-9213-widget-de-reports-en-dashboards' into 'develop' 
delete item into widget pandora_enterprise#9213

See merge request artica/pandorafms!4987
 2022-06-29 16:32:49 +00:00
Daniel Maya ebe1965ca0 #8763 Fixed height 2022-06-29 17:31:46 +02:00
Daniel Maya 547962c83a Merge branch 'develop' into ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica 2022-06-29 17:27:25 +02:00
Daniel Barbero Martin e3dfbf2bb2 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-29 09:14:17 +02:00
Jimmy Olano 5f5ca9ac13 Merge branch 'ent-9009-dashboards-widget-Estado-del-Módulo-pone-icono-inexistente' into 'develop' 
Ent 9009 dashboards widget estado del módulo pone icono inexistente

See merge request artica/pandorafms!4900
 2022-06-29 01:18:35 +00:00
Daniel Barbero Martin c2c519694a size modal form widget pandora_enterprise#8621 2022-06-28 17:49:58 +02:00
Daniel Barbero Martin 867c6a1415 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-28 17:02:01 +02:00
Diego Muñoz-Reja 3fe66d9a9b Merge branch 'ent-9085-13692-Fallo-permisos-en-creacion-edicion-de-List-of-Special-Days' into 'develop' 
fixed permissions

See merge request artica/pandorafms!4934
 2022-06-28 14:32:31 +00:00
Daniel Maya 90c5155c1c #8939 conflict resolved 2 2022-06-28 11:26:08 +02:00
Daniel Barbero Martin 6d1121602a delete item into widget pandora_enterprise#9213 2022-06-28 11:09:47 +02:00
Daniel Maya 475524df04 #8939 conflict resolved 2022-06-28 10:58:17 +02:00
Daniel Barbero Martin 7a93861a2b fixed size modal pandora_enterprise#8827 2022-06-28 09:14:11 +02:00
Daniel Barbero Martin 941d477403 fixed size modal pandora_enterprise#8827 2022-06-27 18:07:01 +02:00
Daniel Barbero Martin 3cdde5054a size form widgets dashboards pandora_enterprise#8827 2022-06-27 15:43:42 +02:00
Daniel Barbero Martin ebe5f0de7c Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-27 09:48:18 +02:00
Daniel Barbero Martin 24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
 2022-06-27 08:38:50 +02:00
Daniel Barbero Martin 5328cf21c6 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 12:51:35 +02:00
Daniel Rodriguez 4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop' 
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
 2022-06-23 10:07:24 +00:00
Daniel Barbero Martin b63da2066e Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-23 08:22:31 +02:00
edu.corral 19a26d6835 ent 9181 delete agent with delete pending modules 2022-06-22 10:01:35 +02:00
Daniel Barbero Martin 22717d169d Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/service_map.php
 2022-06-21 14:43:47 +02:00
Daniel Barbero Martin c42852a18f refactor events meta pandora_enterprise#9086 2022-06-21 11:20:26 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Rodriguez 9421cd46f5 Merge branch 'ent-8857-llamada-set-new_agent-api-meta' into 'develop' 
Api create agent meta support

See merge request artica/pandorafms!4860
 2022-06-21 08:39:22 +00:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Rodriguez a7c61d9ee8 Merge branch 'ent-9139-Widget-Top-N-sale-mal-Continuacion' into 'develop' 
Fix

See merge request artica/pandorafms!4956
 2022-06-20 08:36:56 +00:00
Calvo 291c6c6a69 Merge remote-tracking branch 'origin/develop' into ent-8857-llamada-set-new_agent-api-meta 2022-06-17 13:27:31 +02:00
Daniel Barbero Martin f3e645146d Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-17 08:51:11 +02:00
Daniel Rodriguez 52cfd6b70a Merge branch 'ent-8899-13499-problema-con-conexion-db-hist-con-contrasenas-con-caracteres-especiales' into 'develop' 
Ent 8899 13499 problema con conexion db hist con contrasenas con caracteres especiales

See merge request artica/pandorafms!4852
 2022-06-16 09:03:28 +00:00
Daniel Maya bb01bfe2d0 #8899 Fixed history_db_enabled 2 2022-06-16 08:44:09 +02:00
Daniel Barbero Martin 1bf1a83782 Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour 2022-06-15 19:49:31 +02:00
José González bb17645c88 Fix 2022-06-10 10:40:28 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Barbero Martin 951a1703bf Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/include/functions_reporting.php
 2022-06-08 08:15:49 +02:00
Daniel Rodriguez bf7941ddd2 Merge branch 'ent-7757-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual-dashboard' into 'develop' 
Service tree view with local scope parents

See merge request artica/pandorafms!4826
 2022-06-07 10:47:26 +00:00
Daniel Maya d6fc15f0bf #8763 Added filter groups 2022-06-06 11:14:09 +02:00
Daniel Barbero Martin 459df79c8b Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-06 08:16:25 +02:00
alejandro.campos@artica.es bf2ef75552 fixed permissions 2022-06-03 11:39:58 +02:00
Daniel Rodriguez 1f54d030c7 Merge branch 'ent-8928-Nuevo-widget-OS-Quick-Report' into 'develop' 
Ent 8928 nuevo widget os quick report

See merge request artica/pandorafms!4877
 2022-06-03 08:12:50 +00:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-03 09:28:18 +02:00