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

405 Commits

Author SHA1 Message Date
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
Daniel Rodriguez
0a51c5f916 Merge branch 'ent-8587-nueva-representacion-de-servicios-sunburst' into 'develop' 
Ent 8587 nueva representacion de servicios sunburst

See merge request artica/pandorafms!4819
 2022-06-02 07:21:17 +00:00
Daniel Barbero Martin
0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Barbero Martin
4f27aba72c new widget block histogram pandora_enterprise#8618 2022-05-25 09:06:22 +02:00
Daniel Barbero Martin
87baa25662 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-05-24 09:32:06 +02:00
Daniel Barbero Martin
71fcb4fb9f fix error sql service pandora_enterprise#9018 2022-05-23 17:29:41 +02:00
Daniel Maya
c2fe3c5d34 #9009 Fixed icon 2022-05-23 16:03:37 +02:00
Daniel Barbero Martin
31ef3f5375 add new widget color tabs module pandora_enterprise#8621 2022-05-23 12:20:50 +02:00
Daniel Barbero Martin
9d2c179423 add new widget color tabs module pandora_enterprise#8621 2022-05-19 18:00:49 +02:00
Daniel Barbero Martin
c437b894a3 fixed modal size configuration widgets pandora_enterprise#8827 2022-05-18 12:55:10 +02:00
Daniel Maya
2c1ac769a4 #8929 Added group recursion 2022-05-18 11:06:15 +02:00
Daniel Maya
4ae2df8ded #8939 comment optimization 2022-05-17 13:42:38 +02:00
Daniel Barbero Martin
ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
José González
200fdf9d9f Resuelto. Merge branch 'develop' into 'ent-8892-Widget-TopN-sale-mal' 
# Conflicts:
#   pandora_console/include/lib/Dashboard/Widgets/top_n.php
 2022-05-12 08:20:50 +00:00
José González
b1c87d6a40 Minor fix for show better only booleans modules 2022-05-11 17:37:57 +02:00
Daniel Maya
644948c1b5 #8928 font size 2022-05-10 14:53:33 +02:00
Daniel Maya
4699ec7a3f #8928 Added img 2022-05-10 13:44:10 +02:00
Daniel Maya
2fb2853cd1 #8928 Added os quick report 2022-05-10 10:01:17 +02:00