30348 Commits

Author SHA1 Message Date
Daniel Barbero Martin
acef7e6f63 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-16 09:09:49 +02:00
Daniel Rodriguez
74e2dcad26 Merge branch 'ent-9064-Cambiar-logo-en-CSS-blanco-estándar' into 'develop'
Set new brand and color for header

See merge request artica/pandorafms!4944
2022-06-16 06:43:21 +00:00
Daniel Rodriguez
d57394c0b9 Merge branch 'ent-8856-no-funciona-crear-componentes-en-metaconsola-api-2' into 'develop'
Ent 8856 no funciona crear componentes en metaconsola api 2

See merge request artica/pandorafms!4955
2022-06-16 06:42:38 +00:00
Daniel Rodriguez
ffdc8ee656 Merge branch 'ent-9032-Mejora-visual-eventos-largos-destrozan' into 'develop'
Improve event names

See merge request artica/pandorafms!4951
2022-06-16 06:41:07 +00:00
artica
592d09d34a Auto-updated build strings. 2022-06-16 01:00:17 +02:00
Daniel Rodriguez
a8c649c18a Merge branch 'ent-8630-Mensaje-de-erroneo-al-registrar-nodo-enlazado-a-una-meta' into 'develop'
prevent registration dialog from showing up in update manager of metaconsole nodes

See merge request artica/pandorafms!4832
2022-06-15 12:22:11 +00:00
Daniel Barbero Martin
8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin
080c10aad7 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-15 08:50:00 +02:00
artica
3ee1ba0bbc Auto-updated build strings. 2022-06-15 01:00:16 +02:00
Daniel Barbero Martin
b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Daniel Rodriguez
709b49a371 Merge branch 'ent-9134-Falta-campo-disable-de-tabla-autoconfig-en-pandoradb.sql' into 'develop'
Ent 9134 falta campo disable de tabla autoconfig en pandoradb.sql

See merge request artica/pandorafms!4954
2022-06-14 12:10:22 +00:00
Daniel Rodriguez
c00f1ed1b6 Merge branch 'ent-8838-Longitud-id-user-tusuario' into 'develop'
changed id_user field length from tusuario

See merge request artica/pandorafms!4876
2022-06-14 09:33:09 +00:00
alejandro.campos@artica.es
ec7a2f89bd revert migrate file 2022-06-14 10:17:43 +02:00
alejandro.campos@artica.es
4d3d684eeb revert migrate file 2022-06-14 10:15:15 +02:00
alejandro.campos@artica.es
ac246aefb1 revert migrate file 2022-06-14 10:06:28 +02:00
alejandro.campos@artica.es
c09d1334d6 revert migrate file 2022-06-14 10:05:05 +02:00
Daniel Barbero Martin
3b3e964cf9 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-14 07:57:18 +02:00
artica
c7b8c55284 Auto-updated build strings. 2022-06-14 01:00:42 +02:00
Daniel Barbero Martin
90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
José González
dc599d2fe6 Handle header image with community and with black theme 2022-06-13 16:23:37 +02:00
alejandro.campos@artica.es
5539ca51c5 minor change 2022-06-13 12:32:04 +02:00
Daniel Rodriguez
871e1cc0c0 Merge branch 'ent-9066-Mala-traducción-al-castellano-Menú-colapsado' into 'develop'
Fixed languages files

See merge request artica/pandorafms!4943
2022-06-13 09:42:45 +00:00
Daniel Rodriguez
38de162f94 Merge branch 'ent-9031-Mejora-visual-Cajas-de-busqueda-avanzada-de-ver-eventos' into 'develop'
Ent 9031 mejora visual cajas de busqueda avanzada de ver eventos

See merge request artica/pandorafms!4925
2022-06-13 09:22:54 +00:00
Daniel Rodriguez
3506fd0067 Merge branch 'ent-9030-cambiar-altura-lista-vista-filtro-eventos' into 'develop'
Change selector size

See merge request artica/pandorafms!4920
2022-06-13 09:22:22 +00:00
Daniel Barbero Martin
5680b82563 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-13 08:16:40 +02:00
artica
85f31c5ab4 Auto-updated build strings. 2022-06-13 01:00:16 +02:00
artica
62bcc9e267 Auto-updated build strings. 2022-06-12 01:00:15 +02:00
artica
46897aff83 Auto-updated build strings. 2022-06-11 01:00:50 +02:00
artica
32c62e9f93 Auto-updated build strings. 2022-06-10 01:00:21 +02:00
edu.corral
ae657ee018 8856 meta api functions 2022-06-09 17:22:00 +02:00
Daniel Maya
519fd13299 #9134 Added dsiabled in mr 2022-06-09 15:22:14 +02:00
Daniel Maya
a5517a9c02 #9134 Added disabled 2022-06-09 15:12:05 +02:00
Daniel Rodriguez
50442faf26 Merge branch 'ent-9108-No-funciona-widget-Odometro-en-version-Open' into 'develop'
Ent 9108 no funciona widget odometro en version open

See merge request artica/pandorafms!4938
2022-06-09 12:50:39 +00:00
José González
bce182f2b2 Improve event names 2022-06-09 11:02:11 +02:00
Daniel Rodriguez
6a8abc035f Merge branch 'ent-9076-Texto-Update-Manager' into 'develop'
fixed wrong encoding

See merge request artica/pandorafms!4950
2022-06-09 07:39:31 +00:00
Daniel Rodriguez
60dad90807 Merge branch 'ent-9060-Bulk-operations-modifican-todos-modulos-incluso-con-acceso-restringido' into 'develop'
Fix issue with bulk operations over modules with not allowed groups

See merge request artica/pandorafms!4922
2022-06-09 07:36:20 +00:00
Daniel Rodriguez
336bc74d49 Merge branch 'ent-9021-proteccion-en-cascada-bucle-padre-hijo' into 'develop'
Ent 9021 proteccion en cascada bucle padre hijo

See merge request artica/pandorafms!4921
2022-06-09 07:34:40 +00:00
Daniel Rodriguez
ad9a864b1c Merge branch 'ent-9116-13158-Nuevos-fallos-componentes-locales-con-politicas-con-macro' into 'develop'
fixed macro default value not loading

See merge request artica/pandorafms!4941
2022-06-09 07:32:18 +00:00
artica
9d28c67a1c Auto-updated build strings. 2022-06-09 01:00:21 +02:00
alejandro.campos@artica.es
c48eae6da0 fixed wrong encoding 2022-06-08 18:25:32 +02:00
Daniel Barbero Martin
8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
José González
bad2438867 Update massive_edit_modules.php 2022-06-08 12:38:03 +00:00
alejandro.campos@artica.es
6f0782782e Merge remote-tracking branch 'origin/develop' into ent-8838-Longitud-id-user-tusuario 2022-06-08 11:54:35 +02:00
alejandro.campos@artica.es
12b0f5cda1 database changes 2022-06-08 11:49:48 +02:00
Daniel Rodriguez
a40efcfee5 Merge branch 'ent-9037-controles-pegados-en-agente-detail-view' into 'develop'
Ent 9037 controles pegados en agente detail view

See merge request artica/pandorafms!4936
2022-06-08 09:11:54 +00:00
Daniel Rodriguez
1eea27e1f3 Merge branch 'ent-9040-Mejoras-en-la-vista-de-agents-alerts' into 'develop'
Ent 9040 mejoras en la vista de agents alerts

See merge request artica/pandorafms!4933
2022-06-08 09:11:19 +00:00
Daniel Rodriguez
a2c1b38a3f Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop'
fixed permissions in selectors

See merge request artica/pandorafms!4931
2022-06-08 09:10:51 +00: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
artica
8a5847a225 Auto-updated build strings. 2022-06-08 01:00:24 +02:00
Daniel Barbero Martin
ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00