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

24743 Commits

Author SHA1 Message Date
Jimmy Olano 7b411ae0de Merge branch 'ent-9045-mensaje-de-error-por-falta-de-acceso-fallos-de-formato' into 'develop' 
Ent 9045 mensaje de error por falta de acceso fallos de formato

#9045 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9045

See merge request artica/pandorafms!5004
 2022-07-22 14:39:18 +00:00
Daniel Barbero Martin 57f82b0c31 fix 550 error evnts mobile php 7.2 pandora_enterprise#9307 2022-07-22 12:27:58 +02:00
Daniel Barbero Martin bdd9612812 fix error custom data show all in tab events pandora_enterprise#9305 2022-07-22 10:13:57 +02:00
Daniel Barbero Martin bbf9174903 fix error custom data events list pandora_enterprise#9304 2022-07-22 10:11:14 +02:00
Jimmy Olano 33f6ae1875 Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop' 
Alerts list datatable

Ref: pandora_enterprise#8797

See merge request artica/pandorafms!5018
 2022-07-22 02:39:35 +00:00
artica fa23c453a1 Auto-updated build strings. 2022-07-22 01:00:21 +02:00
Daniel Rodriguez 5d674b76b6 Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' 
new filter search eventspandora_enterprise#8942

See merge request artica/pandorafms!5007
 2022-07-21 10:15:49 +00:00
Calvo e286793e95 Fix alert list agent link in metaconsole 2022-07-21 11:52:45 +02:00
Daniel Barbero Martin ac23665244 Merge remote-tracking branch 'origin/develop' into ent-8564-operaciones-masivas-metaconsola-edicion-de-agentes 2022-07-21 10:58:37 +02:00
Jimmy Olano 673798a43e Merge branch 'ent-9279-doble-refresco-en-vista-de-eventos-de-metaconsola-al-tener-autorrefresco-activado' into 'develop' 
double refresh page events pandora_enterprise#9279

pandora_enterprise#9279

See merge request artica/pandorafms!5021
 2022-07-21 01:36:33 +00:00
artica b76dc9d062 Auto-updated build strings. 2022-07-21 01:00:17 +02:00
Jimmy Olano 7f1ecff302 Merge branch 'ent-9062-mensaje-de-advertencia-sin-traducir' into 'develop' 
Add transaltion to discovery message

Ref: pandora_enterprise#9062

See merge request artica/pandorafms!4967
 2022-07-20 22:24:13 +00:00
Junichi Satoh 44cc9898c2 Fixed deb package creation scripts to work with recent Ubuntu, 20.04 LTS and 22.04 LTS. 2022-07-20 14:10:37 +09:00
artica 385610fef6 Auto-updated build strings. 2022-07-20 01:00:21 +02:00
Jimmy Olano b512a359d4 Merge branch 'ent-8522-13078-edicion-de-elementos-de-un-servicio-2' into 'develop' 
fix error services items pandora_enterprise#8522

pandora_enterprise#8522

See merge request artica/pandorafms!5024
 2022-07-19 22:16:56 +00:00
Jimmy Olano 97132edd4f Merge branch 'ent-9284-13964-fallo-en-creacion-de-eventos-via-api-create_event-a-la-hora-de-guardar-timestamp-del' into 'develop' 
fix time api create event pandora_enterprise#9284

pandora_enterprise#9284

See merge request artica/pandorafms!5022
 2022-07-19 14:43:54 +00:00
Diego Muñoz-Reja 288e6f3a53 Merge branch 'ent-9140-POST-Usuarios-LDAP-no-ven-comentarios-de-eventos-agrupados' into 'develop' 
Ent 9140 post usuarios ldap no ven comentarios de eventos agrupados

See merge request artica/pandorafms!4993
 2022-07-19 13:07:45 +00:00
Daniel Barbero Martin 1e9ca202f0 fix error services items pandora_enterprise#8522 2022-07-19 11:09:49 +02:00
Daniel Barbero Martin 027f61daff Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos 
Conflicts:
	pandora_console/extras/mr/56.sql
 2022-07-19 10:18:04 +02:00
Daniel Barbero Martin 44a2bb2bdb fix mobile index access user to node pandora_enterprise#9280 2022-07-19 10:13:43 +02:00
Calvo 642c60428c Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola 2022-07-19 09:40:56 +02:00
Daniel Rodriguez 93e9992b19 Merge branch 'ent-9156-13785-cuadro-processing-ocupa-demasiado-en-eventos' into 'develop' 
loading events pandora_enterprise#9156

See merge request artica/pandorafms!5014
 2022-07-19 06:31:49 +00: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
Jimmy Olano a296a58b61 Merge branch 'ent-9104-selector-multiple-a-veces-escoge-elementos-incorrectos' into 'develop' 
Ent 9104 selector multiple a veces escoge elementos incorrectos

#9104 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9104

See merge request artica/pandorafms!5006
 2022-07-19 01:33:57 +00:00
Jimmy Olano 3bbd08ec11 Merge branch 'ent-8249-12679-Incluir-filtrado-por-nombre-en-vista-de-arbol-de-servicios' into 'develop' 
Ent 8249 12679 incluir filtrado por nombre en vista de arbol de servicios

Ref pandora_enterprise#8249

See merge request artica/pandorafms!4899
 2022-07-19 01:06:53 +00:00
artica 672abbde79 Auto-updated build strings. 2022-07-19 01:00:18 +02:00
Jimmy Olano 8f00e9da6c Merge branch 'ent-9044-Mejorar-interfaz-de-herramienta-de-copia-de-configuraciones-remotas' into 'develop' 
Added Go Back input function

pandora_enterprise#9044

See merge request artica/pandorafms!4997
 2022-07-18 22:35:09 +00:00
Daniel Barbero Martin 13832dcfa2 fix time api create event pandora_enterprise#9284 2022-07-18 17:06:12 +02:00
Daniel Barbero Martin 84fbf0e3dd double refresh page events pandora_enterprise#9279 2022-07-18 16:44:31 +02:00
artica 00d4f66dc3 Auto-updated build strings. 2022-07-18 01:00:16 +02:00
artica 914c12465b Auto-updated build strings. 2022-07-17 01:00:17 +02:00
artica 72a86aca26 Auto-updated build strings. 2022-07-16 01:00:18 +02:00
Diego Muñoz-Reja ab38cfa836 Merge branch 'ent-9274-error-500-vista-agente-al-entrar-por-consola-mobile-en-un-agente' into 'develop' 
fix agents mobile pandora_enterprise#9274

See merge request artica/pandorafms!5015
 2022-07-15 12:27:15 +00:00
Calvo 3ee8f6b431 Added switch to agetn conf to avoid automatic Ip update 2022-07-15 13:40:54 +02:00
Calvo 34333f9f88 Alerts list datatable 2022-07-15 12:15:37 +02:00
Daniel Maya 987678b339 #9107 Fixed filter event 2022-07-15 11:38:46 +02:00
artica 99bfdc804e Auto-updated build strings. 2022-07-15 01:00:20 +02:00
Diego Muñoz-Reja 889d80fbdb Merge branch 'ent-8889-Redirecciones-usuarios-en-Carrefour' into 'develop' 
Ent 8889 redirecciones usuarios en carrefour

See merge request artica/pandorafms!4885
 2022-07-14 14:59:12 +00:00
Daniel Maya 0ff688f6fa #8889 Fixed url location 2022-07-14 16:50:26 +02:00
Daniel Barbero Martin e58bc4f96a move massive aperation edit agent pandora_enterprise#8564 2022-07-14 16:06:51 +02:00
Daniel Maya 4011ca99fe #8769 Resolved conflict 2 2022-07-14 13:02:39 +02:00
Diego Muñoz-Reja 0f770edc13 Merge branch 'ent-8732-giss-13230-aplicar-reglas-de-autoconfiguracion-de-forma-programada' into 'develop' 
Ent 8732 giss 13230 aplicar reglas de autoconfiguracion de forma programada

See merge request artica/pandorafms!5011
 2022-07-14 10:35:52 +00:00
artica 47e28e283b Auto-updated build strings. 2022-07-14 01:00:14 +02:00
Diego Muñoz-Reja 74d19b3dbd Merge branch 'ent-9029-Mejora-estética-en-header-vista-agente' into 'develop' 
Ent 9029 mejora estética en header vista agente

See merge request artica/pandorafms!5003
 2022-07-13 12:54:54 +00:00
Daniel Barbero Martin 644164040f fix agents mobile pandora_enterprise#9274 2022-07-13 12:34:29 +02:00
Daniel Barbero Martin 1f394907c9 loading events pandora_enterprise#9156 2022-07-13 12:28:18 +02:00
Daniel Maya e8c7c38c1f #8732 Resolved conflict 2022-07-13 11:31:18 +02:00
artica 85c66a390c Auto-updated build strings. 2022-07-13 01:00:19 +02:00
Daniel Maya 9d259a4097 #9029 Added starmap 3 2022-07-12 16:18:17 +02:00
Daniel Maya 4f7918114b #9029 Added starmap 2 2022-07-12 13:45:01 +02:00
Daniel Barbero Martin 628d9b5630 new console report pandora_enterprise#6367 2022-07-12 10:18:06 +02:00
Daniel Barbero Martin fc37f158d1 Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-07-12 08:55:30 +02:00
artica d601ca88ca Auto-updated build strings. 2022-07-12 01:00:19 +02:00
Daniel Barbero Martin 8e2b074460 new console report pandora_enterprise#6367 2022-07-11 16:42:20 +02:00
Daniel Barbero Martin 8987f733d3 Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val 2022-07-11 08:37:50 +02:00
Diego Muñoz-Reja 289646a9b9 Merge branch 'ent-9230-no-se-muestra-la-version-de-codigo-instalada-en-el-footer-al-actualizar-a-763' into 'develop' 
Addded pandora_version and build_version globals

See merge request artica/pandorafms!4994
 2022-07-11 06:19:41 +00:00
artica 92936b5267 Auto-updated build strings. 2022-07-11 01:00:52 +02:00
artica c72bf4fc9e Auto-updated build strings. 2022-07-10 01:00:19 +02:00
artica be923c8838 Auto-updated build strings. 2022-07-09 01:00:37 +02:00
Diego Muñoz-Reja b276af9de3 Merge branch 'ent-9226-Cambio-en-MR-de-tabla-Enterprise' into 'develop' 
Ent 9226 cambio en mr de tabla enterprise

See merge request artica/pandorafms!5000
 2022-07-08 12:03:22 +00:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
Daniel Maya 994c76a39b #8732 Added autoconfiguration scheduled 2022-07-08 11:02:58 +02:00
artica 66cb2b42c2 Auto-updated build strings. 2022-07-08 01:00:24 +02:00
Diego Muñoz-Reja bdb1fda92e Merge branch 'ent-9019-13559-Bug-en-logueo-con-AD-con-el-nombre' into 'develop' 
Ent 9019 13559 bug en logueo con ad con el nombre

See merge request artica/pandorafms!4910
 2022-07-07 10:44:46 +00:00
artica 6e30b7cc0e Auto-updated build strings. 2022-07-07 01:00:27 +02:00
Diego Muñoz-Reja c756f804a7 Merge branch 'ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos' into 'develop' 
modal sound events pandora_enterprise#9095

See merge request artica/pandorafms!4998
 2022-07-06 14:57:44 +00:00
edu.corral 53fa3c8b8d ent-9185 tree view alerts modal window 2022-07-06 12:15:31 +02:00
edu.corral 36e2043102 ent-9091 setup view 2022-07-06 10:58:16 +02: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
Daniel Maya 86052ff28a #8769 Fixed conflict 2022-07-06 09:49:39 +02:00
artica 0421b3aebd Auto-updated build strings. 2022-07-06 01:00:31 +02:00
Daniel Maya a71c26b4a7 #9029 Added starmap 2022-07-05 17:44:52 +02: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
Diego Muñoz-Reja 3ebcf710ee Merge branch 'ent-9245-13886-auth-token-en-respuesta-de-vista-de-eventos' into 'develop' 
fix error events pandora_enterprise#9245

See merge request artica/pandorafms!5002
 2022-07-05 15:14:18 +00:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
edu.corral 4673a253f9 ent-9104 selector multiple 2022-07-05 13:38:59 +02:00
Daniel Maya a1aa179031 #9257 Fixed return array 2022-07-05 13:12:29 +02:00
artica 45671b7c39 Auto-updated build strings. 2022-07-05 01:00:25 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Maya e839d82e00 resolved conflict 2022-07-04 13:40:06 +02:00
Diego Muñoz-Reja 08a9761046 Merge branch 'ent-9239-bug-eventos-nodo' into 'develop' 
bugs events pandora_enterprise#9239

See merge request artica/pandorafms!4995
 2022-07-04 11:04:04 +00:00
edu.corral 4764b4ea3d ent-9045 error message v2 2022-07-04 12:38:50 +02:00
edu.corral 81283e2626 ent-9045 error message 2022-07-04 10:46:55 +02:00
Daniel Barbero Martin 15363b1ac5 Merge remote-tracking branch 'origin/develop' into ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos 2022-07-04 09:12:10 +02:00
artica 225da0dac5 Auto-updated build strings. 2022-07-04 01:00:25 +02:00
artica 5ad9178bc4 Auto-updated build strings. 2022-07-03 01:00:26 +02:00
artica a8a1069aaa Auto-updated build strings. 2022-07-02 01:00:31 +02:00
Daniel Barbero Martin de926b5677 fix error events pandora_enterprise#9245 2022-07-01 13:54:33 +02:00
Daniel Barbero Martin 8bb1263fa9 fix error report top n pandora_enterprise#9129 2022-07-01 13:37:39 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Jimmy Olano 2bf757a364 Merge branch 'ent-8252-12671-ordenar-campos-custom-fields-eventos' into 'develop' 
Ent 8252 12671 ordenar campos custom fields eventos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8252

See merge request artica/pandorafms!4948
 2022-07-01 11:01:57 +00:00
Diego Muñoz-Reja 488191d9d8 Merge branch 'ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales' into 'develop' 
top n regex pandora_enterprise#9129

See merge request artica/pandorafms!4989
 2022-07-01 10:57:20 +00:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' 
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302

See merge request artica/pandorafms!4949
 2022-07-01 10:47:27 +00:00
Daniel Maya b43b7b4fa5 #9226 Added tuser_task tables 2022-07-01 10:37:08 +02:00
artica 219d82c230 Auto-updated build strings. 2022-07-01 01:00:22 +02:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +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
José González d0622e7a3b Added Go Back input function 2022-06-30 13:41:56 +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
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56:25 +02:00
Calvo fe46bb9235 Addded pandora_version and build_version globals 2022-06-30 11:24:17 +02:00
Jimmy Olano fb5dd4d557 Merge branch 'ent-8588-Diferencias-de-filtrado-en-vistas-similares-de-Pandora' into 'develop' 
fixed query filter

Ref pandora_enterprise#8588

See merge request artica/pandorafms!4895
 2022-06-29 23:54:48 +00:00
artica 87837d7c8f Auto-updated build strings. 2022-06-30 01:00:33 +02:00
Jimmy Olano efa0640d8c Merge branch 'ent-9121-13735-no-aparece-nombre-modulos-en-leyenda-seccion-graficas-dentro-del-agente-v762' into 'develop' 
legend combined graph module view pandora_enterprise#9121

pandora_enterprise#9121

See merge request artica/pandorafms!4986
 2022-06-29 22:37:25 +00:00
Jimmy Olano f07ed9e4e9 Merge branch 'ent-9125-Bug-a-la-hora-de-crear-gráficas-personalizadas-desde-el-agente' into 'develop' 
Ent 9125 bug a la hora de crear gráficas personalizadas desde el agente

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9125

See merge request artica/pandorafms!4946
 2022-06-29 22:25:00 +00:00
Jimmy Olano 1e832e9e8d Merge branch 'ent-9172-Edición-de-usuario-superadmin' into 'develop' 
Ent 9172 edición de usuario superadmin

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9172

See merge request artica/pandorafms!4985
 2022-06-29 17:55:51 +00: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
Diego Muñoz-Reja bc6f234029 Merge branch 'ent-9093-Harce-mas-grande-el-selector-acciones-alertas' into 'develop' 
Resized alert action list and refactor

See merge request artica/pandorafms!4980
 2022-06-29 14:50:37 +00:00
Diego Muñoz-Reja 0d8cfc3986 Merge branch 'ent-9147-13774-Lista-elementos-consola-visual-falla-con-muchos-elementos' into 'develop' 
fixed vc elements edition

See merge request artica/pandorafms!4963
 2022-06-29 14:36:41 +00:00
Diego Muñoz-Reja b9b074404c Merge branch 'ent-9158-Reloj-digital-en-consola-visual-se-descuadra-al-cambiar-de-tamaño' into 'develop' 
Ent 9158 reloj digital en consola visual se descuadra al cambiar de tamaño

See merge request artica/pandorafms!4965
 2022-06-29 14:13:24 +00:00
Diego Muñoz-Reja a2125580d9 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' into 'develop' 
Improved error message

See merge request artica/pandorafms!4939
 2022-06-29 14:01:49 +00:00
Daniel Maya 43b2a3d47e #9140 Fixed comments 2022-06-29 15:34:09 +02:00
Daniel Barbero Martin 2ff94b319c Merge remote-tracking branch 'origin/develop' into ent-9129-ampliar-funcionalidad-de-los-informes-top-n-actuales 2022-06-29 13:54:27 +02:00
José González 7edcd3b0a6 Improve code and fix update alerts 2022-06-29 11:05:50 +02:00
José González ca0763f379 Merge branch 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' of https://brutus.artica.es:8081/artica/pandorafms into ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager 2022-06-29 10:20:31 +02:00
José González ef3dd0e741 Improved error message 2022-06-29 10:20:17 +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 f48d3a9849 Merge branch 'ent-8984-13630-Cuenta-de-plantillas-de-alerta-no-coincide' into 'develop' 
Ent 8984 13630 cuenta de plantillas de alerta no coincide

See merge request artica/pandorafms!4902
 2022-06-29 02:40:08 +00: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
Jimmy Olano aeb40bacc9 Merge branch 'ent-9101-13724-Fallo-operator-read-en-dashboard' into 'develop' 
Ent 9101 13724 fallo operator read en dashboard

See merge request artica/pandorafms!4945
 2022-06-29 01:11:44 +00:00
artica 87db3d57b5 Auto-updated build strings. 2022-06-29 01:00:36 +02:00
Daniel Barbero Martin c2c519694a size modal form widget pandora_enterprise#8621 2022-06-28 17:49:58 +02:00
Diego Muñoz-Reja 9120eb44c5 Merge branch 'ent-9231-grave-problema-seguridad-vista-de-eventos-metaconsola' into 'develop' 
fix events pandora_enterprise#9231

See merge request artica/pandorafms!4990
 2022-06-28 15:37:46 +00:00
Diego Muñoz-Reja 4d48bdec36 Merge branch 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' into 'develop' 
Changed strings and improve code

See merge request artica/pandorafms!4935
 2022-06-28 15:22:08 +00:00
Diego Muñoz-Reja b73389fff0 Merge branch 'ent-9033-Vista-de-eventos-Validar-eventos-repetidos' into 'develop' 
Ent 9033 vista de eventos validar eventos repetidos

See merge request artica/pandorafms!4953
 2022-06-28 15:17:13 +00: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
Daniel Barbero Martin 0957dd338f fix events pandora_enterprise#9231 2022-06-28 16:56:25 +02:00
José González 2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' 
# Conflicts:
#   pandora_console/index.php
 2022-06-28 14:39:37 +00:00
Daniel Barbero Martin 2632816e13 top n regex pandora_enterprise#9129 2022-06-28 16:32:37 +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
José González b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' 
# Conflicts:
#   pandora_console/godmode/menu.php
 2022-06-28 14:08:13 +00:00
daniel 4ca27cd5a9 Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop' 
events sound pandora_enterprise#7960

See merge request artica/pandorafms!4923
 2022-06-28 13:47:05 +00:00
daniel 867e659118 Merge branch 'ent-1419-umbrales-en-graficas-pdf-4649-com1' into 'develop' 
add treshold pdf pandora_enterprise#1419

See merge request artica/pandorafms!4894
 2022-06-28 13:45:53 +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 9612bd69f1 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard 2022-06-28 09:17:58 +02:00
Daniel Barbero Martin 7a93861a2b fixed size modal pandora_enterprise#8827 2022-06-28 09:14:11 +02:00
Daniel Barbero Martin 6edc6e1014 Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-28 08:51:22 +02:00
artica 6765cc136f Auto-updated build strings. 2022-06-28 01:01:20 +02:00
Daniel Barbero Martin 941d477403 fixed size modal pandora_enterprise#8827 2022-06-27 18:07:01 +02:00
Daniel Maya 2049805de7 #9033 conflict resolved 2022-06-27 17:13:23 +02:00
Daniel Barbero Martin d969ac42bf legend combined graph module view pandora_enterprise#8621 2022-06-27 17:09:27 +02:00
Daniel Maya 693c5d5044 #9172 Changed configure user 2022-06-27 16:48:00 +02:00
Daniel Barbero Martin 1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/functions_events.php
 2022-06-27 16:07:19 +02:00
Daniel Barbero Martin b82ea58efd new icons widgets dashboards pandora_enterprise#8621 2022-06-27 16:00:36 +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 f1ac9cefd8 new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:47:33 +02:00
Daniel Barbero Martin a5e845e98f new icons widgets dashboards pandora_enterprise#8621 2022-06-27 09:45:21 +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
artica beefbff267 Auto-updated build strings. 2022-06-27 01:00:34 +02:00
artica cab6fdbf12 Auto-updated build strings. 2022-06-26 01:00:39 +02:00
artica 036aa788fa Auto-updated build strings. 2022-06-25 01:00:46 +02:00
Junichi Satoh 8123392c50 Updated Japanese console translations. 2022-06-24 13:53:57 +09:00
artica a7051ea40d Auto-updated build strings. 2022-06-24 01:00:53 +02:00
vanessa gil 653226d45b Clean version. 2022-06-23 19:54:26 +02:00
Daniel Barbero Martin f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Barbero Martin bf28b44339 mr 2022-06-23 14:35:38 +02:00
Daniel Rodriguez 7af375567d Merge branch 'ent-9197-Problema-cabecera-menu' into 'develop' 
Change collapsed filename

See merge request artica/pandorafms!4977
 2022-06-23 12:29:26 +00: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 Barbero Martin 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
José González 237de0ee97 Resized alert action list and refactor 2022-06-23 12:21:00 +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 6a614847a2 refactor events meta pandora_enterprise#9086 2022-06-23 11:49:04 +02:00
Daniel Rodriguez c0509a798c Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop' 
Added control for WMI binary

See merge request artica/pandorafms!4884
 2022-06-23 08:27:11 +00:00
Daniel Rodriguez d6ab78ba68 Merge branch 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' into 'develop' 
Ent 8912 problemas en recuperación alertas de evento   necesaria refactorizacion

See merge request artica/pandorafms!4959
 2022-06-23 07:53:11 +00:00
artica 7854206ede Updated version and build strings. 2022-06-23 08:27:31 +02: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
artica a254c7d3c5 Auto-updated build strings. 2022-06-23 01:01:15 +02:00
José González 82480fa503 Updated logo 2022-06-22 16:46:24 +02:00
Daniel Rodriguez 428de71b85 Merge branch 'ent-9192-cambio-imagen-warp-update-online' into 'develop' 
new images update manager online pandora_enterprise#9192

See merge request artica/pandorafms!4976
 2022-06-22 14:44:20 +00:00
José González f241202168 Update delete_files.txt 2022-06-22 14:34:23 +00:00
José González 5e09b99504 Change collapsed filename 2022-06-22 16:00:04 +02:00
Daniel Barbero Martin e77ae67fb2 new images update manager online pandora_enterprise#9192 2022-06-22 14:48:54 +02:00
Daniel Rodriguez 7e206716d7 Merge branch 'ent-9181-problema-al-borrar-agentes-cuando-hay-modulos-delete-pending' into 'develop' 
Ent 9181 problema al borrar agentes cuando hay modulos delete pending

See merge request artica/pandorafms!4973
 2022-06-22 12:29:19 +00:00
José González 38ecfd5b62 Added message for control return code in WMI 2022-06-22 14:25:08 +02:00
Daniel Barbero Martin 0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
Daniel Barbero Martin 962f223670 new images update manager online pandora_enterprise#9192 2022-06-22 12:21:51 +02:00
José González 5f05b79e66 Fix issue with header 2022-06-22 12:06:34 +02:00
Ramon Novoa 59ea9a716e Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-22 11:46:19 +02:00
Daniel Rodriguez 7798e0cd63 Merge branch 'ent-9179-actualizar-traducciones' into 'develop' 
Ent 9179 actualizar traducciones

See merge request artica/pandorafms!4969
 2022-06-22 09:07:30 +00:00
Daniel Rodriguez f35a802c44 Merge branch 'ent-7926-giss-12134-token-para-cambiar-comportamiento-de-evaluacion-de-servicios' into 'develop' 
#7926 Added asynchronous mode

See merge request artica/pandorafms!4972
 2022-06-22 09:06:40 +00:00
Daniel Barbero Martin 4b00e8ee3c refactor events meta pandora_enterprise#9086 2022-06-22 10:29:19 +02:00
Daniel Barbero Martin f39d502108 refactor events meta pandora_enterprise#9086 2022-06-22 10:11:24 +02:00
edu.corral 19a26d6835 ent 9181 delete agent with delete pending modules 2022-06-22 10:01:35 +02:00
Daniel Barbero Martin 4ca78ec00c refactor events meta pandora_enterprise#9086 2022-06-22 09:44:00 +02:00
Daniel Barbero Martin 9505206328 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-22 08:48:38 +02:00
artica a17232fb86 Auto-updated build strings. 2022-06-22 01:00:51 +02:00
Daniel Maya 44fdf1c321 #7926 Added asynchronous mode 2022-06-21 16:31:56 +02:00
Daniel Rodriguez 2ab8918463 Merge branch 'ent-9034-Alert-SNMP-como-agent-name-vista-tactica' into 'develop' 
Clean unnecesary message

See merge request artica/pandorafms!4970
 2022-06-21 14:18:16 +00:00
edu.corral 28d25acbcb ent-9179 translations 2022-06-21 15:19:33 +02:00
José González b2b64ae014 Merge remote-tracking branch 'origin' into ent-9034-Alert-SNMP-como-agent-name-vista-tactica 2022-06-21 14:47:28 +02:00
José González 4480455258 Clean unnecesary message 2022-06-21 14:45:17 +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 9bb072a48a refactor events meta pandora_enterprise#9086 2022-06-21 14:10:08 +02:00
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
Daniel Barbero Martin f93e141aac refactor events meta pandora_enterprise#9086 2022-06-21 11:22:56 +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 Rodriguez 529ce88d00 Merge branch 'ent-9131-Falla-carga-de-eventos-v762-ante-eventos-especificos' into 'develop' 
Fix possible custom_data with null strings

See merge request artica/pandorafms!4952
 2022-06-21 08:31:53 +00:00
José González 036505fa68 Fix DB issue 2022-06-21 09:38:13 +02:00
José González 346ac640e4 Merge 2022-06-21 09:32:57 +02:00
artica a5d13f5e16 Auto-updated build strings. 2022-06-21 01:00:18 +02:00
Daniel Rodriguez bf8cb56895 Merge branch 'ent-8590-indicar-a-que-satelite-pertenece-un-agente' into 'develop' 
Console changes for 8590

See merge request artica/pandorafms!4947
 2022-06-20 15:11:42 +00:00
Daniel Rodriguez 8fb54be1bb Merge branch 'ent-8730-problema-notificacion-consola-con-parches-soporte' into 'develop' 
some fixes in version control and php memory usage

See merge request artica/pandorafms!4803
 2022-06-20 15:07:01 +00:00
Luis 71326bf8bb Update pandoradb_migrate_6.0_to_759.mysql.sql 2022-06-20 14:57:45 +00:00
José González 275fd2ed19 Fix minor issues related with pandorawmic 2022-06-20 16:20:49 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Rodriguez fa8ed3398f Merge branch 'ent-8061-vista-netflow-con-black-theme' into 'develop' 
Fix black theme issues

See merge request artica/pandorafms!4873
 2022-06-20 09:38:25 +00:00
Daniel Rodriguez f4761e5c0f Merge branch 'ent-9067-no-estan-funcionando-los-enlaces-sistema-de-notificacion' into 'develop' 
Ent 9067 no estan funcionando los enlaces sistema de notificacion

See merge request artica/pandorafms!4964
 2022-06-20 09:09:16 +00:00
Calvo 5a6fc5630e Add transaltion to discovery message 2022-06-20 10:37:25 +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
Ramon Novoa 9b5b4deb67 Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion 2022-06-20 10:25:22 +02:00
Daniel Barbero Martin ca298422bd Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-20 07:58:40 +02:00
artica c4fadcd461 Auto-updated build strings. 2022-06-20 01:00:14 +02:00
artica d2e140e85b Auto-updated build strings. 2022-06-19 01:00:14 +02:00
artica 7574e99e80 Auto-updated build strings. 2022-06-18 01:00:19 +02: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 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
José González 6f903023a7 Fix 2022-06-17 12:42:24 +02:00
Calvo 0c2823f23f Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-17 12:38:11 +02:00
Calvo 5ce0ebb72a Fix agent view satellite name visual 2022-06-17 10:09:37 +02:00
José González 7f2182d52a Merge branch 'develop' into 'ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion' 
# Conflicts:
#   pandora_console/install.php
 2022-06-17 07:37:01 +00:00
José González 93b9e6142e DB Changes #8912 2022-06-17 09:00:35 +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 Maya 6d1f03a633 #9158 Fixed digital clock 2022-06-17 08:17:55 +02:00
artica ddee99b016 Auto-updated build strings. 2022-06-17 01:00:19 +02:00
José González 6d70353254 Fix mistake 2022-06-16 16:09:05 +00:00
edu.corral a0f7c9e6a2 ent-9067 fixed notification system 2022-06-16 16:19:33 +02:00
José González 4c2ad2822f Fix visual issue 2022-06-16 16:04:22 +02:00
Daniel Maya ad98356957 resolved conflict 2022-06-16 14:21:47 +02:00
Daniel Rodriguez bea57c8991 Merge branch 'ent-8861-wizard-snmp-convierte-valores-hex-string-en-string' into 'develop' 
Changed snmpwalk parameters for wizard

See merge request artica/pandorafms!4872
 2022-06-16 12:17:27 +00:00
Daniel Barbero Martin 6f49f63353 fixed VC pandora_enterprise#8888 2022-06-16 14:09:30 +02:00
Daniel Rodriguez d400d5b7dc Merge branch 'ent-8860-mejora-wizard-snmp' into 'develop' 
Applied fix for snmp

See merge request artica/pandorafms!4868
 2022-06-16 11:46:53 +00:00
Daniel Rodriguez ae5c4dca24 Merge branch 'ent-9026-Buscador-roto-agregar-acciones-a-alerta-SNMP' into 'develop' 
Fix several issues with SNMP Alert view

See merge request artica/pandorafms!4913
 2022-06-16 11:35:40 +00:00
edu.corral 4ee4590690 ent-9067 notifications fixed 2022-06-16 13:02:49 +02:00
alejandro.campos@artica.es 705ebb8168 fixed vc elements edition 2022-06-16 12:19:59 +02:00
José González 32bfa233d5 Merge 2022-06-16 11:45:58 +02:00
Daniel Barbero Martin 8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
José González bad0335502 Changed styles 2022-06-16 11:14:29 +02:00
José González ea60e4be71 Added database changes 2022-06-16 11:14:00 +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 Rodriguez fa28b5b7e1 Merge branch 'ent-9000-cambio-update-manager-a-warp-update' into 'develop' 
Ent 9000 cambio update manager a warp update

See merge request artica/pandorafms!4957
 2022-06-16 08:43:12 +00:00
Daniel Rodriguez f34ec5dcc9 Merge branch 'ent-9022-Bug-histórico-de-actualizaciones' into 'develop' 
Ent 9022 bug histórico de actualizaciones

See merge request artica/pandorafms!4917
 2022-06-16 08:42:39 +00:00
Daniel Rodriguez 6a72479771 Merge branch 'ent-9141-dependencias-que-faltan-para-instaladores' into 'develop' 
Adding dependencies to pandorafms rpm packages

See merge request artica/pandorafms!4961
 2022-06-16 07:16:49 +00:00
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 Maya bb01bfe2d0 #8899 Fixed history_db_enabled 2 2022-06-16 08:44:09 +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 Barbero Martin d22c667776 fixed VC pandora_enterprise#8888 2022-06-15 19:50:19 +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
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 Maya 9a7e0e3228 #8899 Fixed history_db_enabled 2022-06-15 09:37:29 +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
Rafael Ameijeiras 26038b6aaa Adding dependencies to pandorafms rpm packages 2022-06-14 16:55:25 +02:00
Rafael Ameijeiras 30fd072cb9 Adding dependencies to pandorafms rpm packages 2022-06-14 16:51:03 +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 Maya 62e0dfa36e #9146 Fixed dbmanager 2022-06-14 13:11:39 +02: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 5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-13 17:10:19 +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
José González 8e4cffbc0a Several style refactory 2022-06-13 12:34:16 +02:00
José González b5de60fb69 Update manager to Warp manager 2022-06-13 12:33:03 +02:00
alejandro.campos@artica.es 5539ca51c5 minor change 2022-06-13 12:32:04 +02:00
José González 2568c877a2 Clear unnecessary CSS file 2022-06-13 12:31:33 +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
José González b068b35d78 Visual improvements 2022-06-10 12:58:13 +02:00
José González 3ec50f10b4 Update warp strings 2022-06-10 12:57:45 +02:00
José González 05bcbfaf79 Minor fixes 2022-06-10 12:57:25 +02:00
José González 022d28981d Update styles 2022-06-10 12:57:04 +02:00
José González 0784b25ea0 Update Warp strings 2022-06-10 12:56:45 +02:00
José González bb17645c88 Fix 2022-06-10 10:40:28 +02:00
José González eed2030bba WIP: Backup upload 2022-06-10 10:17:53 +02:00
José González 815a737a69 Change strings for Update Manager references to WARP update 2022-06-10 10:17:23 +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 Maya 2cfb4e53c2 #9033 Fixed group events 2022-06-09 14:59:43 +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 73a124b299 Fix possible custom_data with null strings 2022-06-09 14:00:53 +02:00
Ramon Novoa 48b20b255b Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente 2022-06-09 12:05:24 +02: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
Daniel Maya 3e15ed2726 #8302 Added show_empty_groups 2022-06-08 15:17:03 +02:00
José González bad2438867 Update massive_edit_modules.php 2022-06-08 12:38:03 +00:00
Daniel Maya e43426ddc8 #8252 Fixed title 2022-06-08 13:29:43 +02:00
Daniel Maya 90d4cfa0db #8252 Move up and down fields 2022-06-08 13:24:27 +02:00
Calvo 5297123d17 Console changes for 8950 2022-06-08 13:10:01 +02: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 Maya 6a8140b36c #9125 Fixed chart type 2022-06-08 10:59:46 +02:00
Daniel Maya 4dd3b63052 #9101 Fixed write permissions 2022-06-08 09:43:36 +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
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
José González ad00594b1d Set new brand and color for header 2022-06-07 17:21:13 +02:00
José González 4f21402992 Fixed languages files 2022-06-07 16:31:55 +02:00
Daniel Maya c9b94273be #8769 removed metaconsole_assigned_server 2022-06-07 15:21:07 +02:00
Daniel Rodriguez fc18c1a168 Merge branch 'ent-9035-Si-no-hay-inventario,-no-deberia-mostrar-la-solapa-de-inventario' into 'develop' 
Hide inventory view if agent dont have inventory modules

See merge request artica/pandorafms!4916
 2022-06-07 11:52:37 +00:00
Daniel Rodriguez 6f5e1c3f94 Merge branch 'ent-8708-Version-mobile-visualiza-alertas-de-agentes-deshabilitados' into 'develop' 
Ent 8708 version mobile visualiza alertas de agentes deshabilitados

See merge request artica/pandorafms!4859
 2022-06-07 11:41:40 +00:00
José González e86d8b761d Refactor and improve code and added dialog for show error 2022-06-07 13:40:35 +02:00
José González 9d071982f5 Improve code 2022-06-07 13:39:58 +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 Rodriguez b962afe56d Merge branch 'ent-9078-Gráfica-de-estados-de-módulos' into 'develop' 
Ent 9078 gráfica de estados de módulos

See merge request artica/pandorafms!4924
 2022-06-07 10:46:18 +00:00
alejandro.campos@artica.es 7aa40617f8 fixed macro default value not loading 2022-06-07 11:20:51 +02:00
Daniel Rodriguez c433fcf3f0 Merge branch 'ent-9038-ocultar-opciones-en-la-busqueda-de-vista-de-modulos' into 'develop' 
Ent 9038 ocultar opciones en la busqueda de vista de modulos

See merge request artica/pandorafms!4930
 2022-06-07 09:12:51 +00:00
Daniel Rodriguez 08d8da9c83 Merge branch 'ent-8999-Cambiar-comportamiento-bulk-operations-meta' into 'develop' 
Ent 8999 cambiar comportamiento bulk operations meta

See merge request artica/pandorafms!4904
 2022-06-07 09:06:47 +00:00
José González 06d9e0d137 Improve security message 2022-06-07 10:51:37 +02:00
artica 851f1a19ce Auto-updated build strings. 2022-06-07 01:00:21 +02:00
José González 67ade2fccd Improved error message 2022-06-06 16:35:02 +02:00
Daniel Maya 44748a0f8b #9108 fixed modules_get_table_data 2022-06-06 16:34:16 +02:00
Daniel Rodriguez 5138756525 Merge branch 'ent-8958-13577-Error-al-quitar-un-comando-de-una-acción' into 'develop' 
Ent 8958 13577 error al quitar un comando de una acción

See merge request artica/pandorafms!4878
 2022-06-06 12:16:15 +00:00
Daniel Rodriguez 618ff10fa2 Merge branch 'ent-8153-POST-Campos-extendidos-en-informe-de-eventos' into 'develop' 
Ent 8153 post campos extendidos en informe de eventos

See merge request artica/pandorafms!4830
 2022-06-06 10:52:51 +00:00
Daniel Maya ea16aac7af #8897 conflict resolved 2022-06-06 11:18:14 +02:00
Daniel Maya d6fc15f0bf #8763 Added filter groups 2022-06-06 11:14:09 +02:00
Daniel Rodriguez 416021bca6 Merge branch 'ent-8822-enlace-web-en-metaconsola-para-nuevas-sugerencias' into 'develop' 
Changed link to Suggest new feature on new installation

See merge request artica/pandorafms!4874
 2022-06-06 08:45:20 +00: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