974 Commits

Author SHA1 Message Date
Daniel Cebrian
b28c97b9b7 Merge branch 'develop' into ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada 2024-01-30 13:25:58 +01:00
Daniel Cebrian
5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
Daniel Cebrian
c0ad547625 #12460 fixed deprecated 2024-01-30 13:14:54 +01:00
daniel
df1d2675ed Merge remote-tracking branch 'origin' into ent-12019-api-2-0 2024-01-30 08:13:47 +01:00
Daniel Cebrian
22598b4bc2 #12460 fixed deprecated 2024-01-29 17:31:19 +01:00
daniel
7adf296b0f new api 2.0 2024-01-29 16:37:49 +01:00
Rafael Ameijeiras
813deba7a5 Merge branch 'ent-12698-nuevos-mensajes-de-bienvenida-quedan-raros-si-el-usuario-no-tiene-full-name' into 'develop'
Ent 12698 nuevos mensajes de bienvenida quedan raros si el usuario no tiene full name

See merge request artica/pandorafms!6875
2024-01-29 15:20:27 +00:00
daniel
b3dd6cbb4c new api 2.0 2024-01-29 16:09:08 +01:00
daniel
65385f36c1 fix visual errors in widgets dashboard pandora_enterprise#12267 2024-01-26 09:18:47 +01:00
daniel
b84d2aeec9 Merge remote-tracking branch 'origin/develop' into ent-12267-dashboard-mejora-del-widget-de-module-status
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
2024-01-26 08:10:07 +01:00
daniel
f1e3328f37 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
Conflicts:
	pandora_console/include/constants.php
2024-01-25 15:46:40 +01:00
daniel
375c2879f6 new api 2.0 2024-01-25 15:44:50 +01:00
Rafael Ameijeiras
e19f520eb0 Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop'
Ent 12522 Mejoras en audit log

See merge request artica/pandorafms!6816
2024-01-25 14:00:56 +00:00
Rafael Ameijeiras
b271cff73e Merge branch 'ent-12754-widget-modules-by-status-bug-al-filtrar-por-estados' into 'develop'
Ent 12754 widget modules by status bug al filtrar por estados

See merge request artica/pandorafms!6858
2024-01-25 13:58:02 +00:00
daniel
a8fc9c767d new api 2.0 2024-01-25 08:19:49 +01:00
daniel
b35af80afb new api 2.0 2024-01-24 09:23:01 +01:00
Daniel Cebrian
7f604f0c8d #12460 fixed deprecated 2024-01-23 17:47:26 +01:00
daniel
2a46720b80 new api 2.0 2024-01-23 17:21:02 +01:00
daniel
a11ebc6a57 new api 2.0 2024-01-23 17:02:23 +01:00
daniel
62b03c05cd Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-23 13:05:24 +01:00
daniel
3c68356b81 new api 2.0 2024-01-23 13:04:44 +01:00
Jonathan
510c28bb09 #12698 fix welcome messages 2024-01-23 10:56:31 +01:00
Daniel Cebrian
d504267460 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-22 15:18:01 +01:00
daniel
3922a052c9 new api 2.0 2024-01-19 13:39:51 +01:00
Daniel Cebrian
da8769c860 #12509 resolve conflicts 2024-01-19 10:26:09 +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
daniel
7145503284 new api 2.0 2024-01-19 07:59:11 +01:00
Matias Didier
6f290f940f Merge branch 'ent-12602-16735-Bug-de-grupos-en-vista-tactica' into 'develop'
fix tactical item

See merge request artica/pandorafms!6840
2024-01-18 14:06:38 +00:00
Rafael Ameijeiras
edc5354c21 Merge branch 'ent-12696-usuario-de-con-permisos-de-grupo-ve-todas-las-paradas-planificadas-en-la-vista-tactica' into 'develop'
Ent 12696 usuario de con permisos de grupo ve todas las paradas planificadas en la vista tactica

See merge request artica/pandorafms!6852
2024-01-18 12:53:02 +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
Daniel Maya
ae3c9bc2f5 #12754 Fixed status 2024-01-18 10:28:57 +01: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
79a70ac588 new api 2.0 2024-01-17 16:41:37 +01:00
Daniel Cebrian
bb2d908de7 #12460 fixed deprecated log 2024-01-17 12:25:57 +01:00
daniel
17edd73f35 new api 2.0 2024-01-17 00:15:41 +01:00
Jonathan
ce00c4b9e5 #12696 fix tactical view error 500 and schedule by group 2024-01-16 17:17:07 +01:00
daniel
bdc500c1b0 new api 2.0 2024-01-16 08:05:45 +01:00
Daniel Maya
31acb0964a #12026 Fixed configuration 2024-01-15 11:18:31 +01:00
daniel
b2a5472be3 new api 2.0 2024-01-12 08:22:17 +01:00
alejandro.campos@artica.es
a712610624 fix tactical item 2024-01-10 11:27:43 +01:00
Daniel Maya
e2471f817d #12321 Added widget Gis map 2024-01-09 14:38:44 +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
e99c7be6b8 #12034 fixed empty screen in public link 2024-01-03 17:58:23 +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
Daniel Cebrian
05ec992fac #12522 enhanced audit log 2023-12-27 16:05:34 +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