Commit Graph

25278 Commits

Author SHA1 Message Date
Daniel Barbero 2d638a61cf Merge remote-tracking branch 'origin/develop' into ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard 2022-12-13 09:59:30 +01:00
Daniel Barbero cbc598eb03 fixed minor error pandora_enterprise#9135 2022-12-13 09:30:56 +01:00
Daniel Barbero a0ddad63b8 Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos
Conflicts:
	pandora_console/extras/mr/59.sql
2022-12-13 09:17:39 +01:00
artica 1ebe09698b Auto-updated build strings. 2022-12-13 01:00:57 +01:00
Rafael Ameijeiras 884e07d11e Merge branch 'ent-9747-14463-faltan-eventos-en-la-consola-cuando-se-seleccionan-todos' into 'develop'
Ent 9747 14463 faltan eventos en la consola cuando se seleccionan todos

See merge request artica/pandorafms!5251
2022-12-12 22:54:27 +00:00
Rafael Ameijeiras d3a079765d Merge branch 'ent-9246-13884-habilitar-_groupcontact_-en-las-respuestas-de-eventos' into 'develop'
add new macro event response group_contact pandora_enterprise#9246

See merge request artica/pandorafms!5240
2022-12-12 22:53:21 +00:00
Calvo af53d63457 Fix alerts bulk operations error 500 2022-12-12 16:51:37 +01:00
Daniel Maya 198f539901 #10000 Fixed api call tree_agents 2022-12-12 16:39:14 +01:00
Calvo 0eb33032ac Changed eHorus default port 2022-12-12 16:17:11 +01:00
Calvo 6913f237dc Fix sql error on widget search 2022-12-12 15:48:10 +01:00
Rafael Ameijeiras 8a6e3e5e06 Merge branch 'ent-8854-13786-alertas-sonoras-en-metaconsola' into 'develop'
add sound events to metaconsole pandora_enterprise#8854

See merge request artica/pandorafms!5246
2022-12-12 14:02:36 +00:00
Rafael Ameijeiras 44655d7ae3 Merge branch 'ent-9152-Opcion-de-habilitar-modulos-en-grupos-en-la-vista-de-agente' into 'develop'
add enable modules massive option

See merge request artica/pandorafms!5215
2022-12-12 11:57:27 +00:00
Rafael Ameijeiras bb22bf87a9 Merge branch 'ent-8755-Poder-editar-plugins-de-servidor' into 'develop'
change update constraints for server plugins

See merge request artica/pandorafms!5261
2022-12-12 11:49:39 +00:00
Diego Muñoz-Reja 31919d4d2c Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop'
Prepare download control

See merge request artica/pandorafms!5276
2022-12-12 08:29:51 +00:00
Rafael Ameijeiras cedee1a3fa Merge branch 'ent-9557-14267-eliminar-dashboards-privados-cuando-se-borra-el-usuario-asignado' into 'develop'
Ent 9557 14267 eliminar dashboards privados cuando se borra el usuario asignado

See merge request artica/pandorafms!5258
2022-12-12 08:21:16 +00:00
Rafael Ameijeiras f9bb893aae Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop'
implemented custom field

See merge request artica/pandorafms!5271
2022-12-12 08:20:08 +00:00
Rafael Ameijeiras 75be3a0c66 Merge branch 'ent-9508-superposicion-de-texto-en-dashboards' into 'develop'
Fix dashboard dialog tranlations and search bar size

See merge request artica/pandorafms!5314
2022-12-12 08:19:39 +00:00
Rafael Ameijeiras 7ea46174c1 Merge branch 'ent-9496-14178-bug-api-validacion-valores-de-entrada' into 'develop'
Fix module type validadion on api set create network module

See merge request artica/pandorafms!5224
2022-12-12 08:14:08 +00:00
Rafael Ameijeiras 1b3535da58 Merge branch 'ent-9709-crear-el-usuario-admin-como-local-por-defecto' into 'develop'
Ent 9709 crear el usuario admin como local por defecto

See merge request artica/pandorafms!5256
2022-12-12 08:12:42 +00:00
Rafael Ameijeiras dab898aaa0 Merge branch 'ent-9873-14572-imagenes-personalizadas-en-elementos-servicios-de-consola-visual-desaparecen' into 'develop'
Ent 9873 14572 imagenes personalizadas en elementos servicios de consola visual desaparecen

See merge request artica/pandorafms!5301
2022-12-12 08:10:10 +00:00
Rafael Ameijeiras bca3cf82c7 Merge branch 'ent-9851-14558-visualizacion-erronea-de-imagenes-en-la-pantalla-de-login' into 'develop'
Ent 9851 14558 visualizacion erronea de imagenes en la pantalla de login

See merge request artica/pandorafms!5292
2022-12-12 08:09:11 +00:00
artica ccde106851 Auto-updated build strings. 2022-12-12 01:00:47 +01:00
artica e57b0af2a3 Auto-updated build strings. 2022-12-11 01:00:15 +01:00
artica bdbd313a0d Auto-updated build strings. 2022-12-10 01:00:15 +01:00
alejandro.campos@artica.es 0f8b7ad834 removed linebreak 2022-12-09 12:50:13 +01:00
alejandro.campos@artica.es 39920692ef Merge remote-tracking branch 'origin/develop' into ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional 2022-12-09 12:49:04 +01:00
Luis Calvo aa85c73a3c Fix alert list view search bug 2022-12-09 08:59:03 +01:00
artica f2ad934c92 Auto-updated build strings. 2022-12-09 01:00:14 +01:00
artica 7cba39d358 Auto-updated build strings. 2022-12-08 01:00:15 +01:00
KANAYAMA Akihiro 63e649be85 Removed unnecessary escape of ampersand. 2022-12-07 19:25:27 +09:00
Calvo 51e6e5b0a1 Fix alert list tag filter 2022-12-07 11:24:09 +01:00
artica 4f194134cc Auto-updated build strings. 2022-12-07 01:00:41 +01:00
artica 0f9977acca Auto-updated build strings. 2022-12-06 01:00:13 +01:00
Calvo c5c36dab8b Fix dashboard dialog tranlations and search bar size 2022-12-05 17:20:08 +01:00
alejandro.campos@artica.es 10d3b67bfa fix task summary 2022-12-05 14:09:12 +01:00
artica d91ba1b4e1 Auto-updated build strings. 2022-12-05 01:00:14 +01:00
artica c9f1cd6566 Auto-updated build strings. 2022-12-04 01:00:15 +01:00
artica 30a4e4af3a Auto-updated build strings. 2022-12-03 01:00:16 +01:00
Calvo 718be360d5 Download wait message 2022-12-02 15:40:47 +01:00
Calvo e0afcd0b85 WIP: Download wait message. datatables 2022-12-02 13:12:58 +01:00
Rafael Ameijeiras 86491e3a78 Merge branch 'ent-9948-Varios-problemas-con-elementos-de-CV-en-php8' into 'develop'
fixed several bugs

See merge request artica/pandorafms!5311
2022-12-02 10:52:46 +00:00
alejandro.campos@artica.es c45d588ca6 fixed several bugs 2022-12-02 10:42:34 +01:00
Calvo d525cb594c WIP: Download wait message 2022-12-02 09:42:24 +01:00
artica 0eead22fdf Auto-updated build strings. 2022-12-02 01:00:15 +01:00
Daniel Rodriguez 35a939e746 Merge branch 'ent-9960-500-en-operaciones-masivas-en-open' into 'develop'
Ent 9960 500 en operaciones masivas en open

See merge request artica/pandorafms!5308
2022-12-01 13:19:57 +00:00
Rafael Ameijeiras 7aea7672c6 Merge branch 'ent-9943-No-se-pueden-crear-templates-de-CV' into 'develop'
fixed vc template creation

See merge request artica/pandorafms!5307
2022-12-01 13:05:03 +00:00
Daniel Rodriguez 338e64c906 Merge branch 'ent-9939-Error-en-query-SQL-de-widget-Top-N-of-agent-module' into 'develop'
fixed query errors

See merge request artica/pandorafms!5306
2022-12-01 12:02:49 +00:00
Daniel Maya 755b9ec2a3 #9960 Fixed array_unique and array_reverse in pandora open 2022-12-01 09:40:46 +01:00
artica 7f694195e9 Auto-updated build strings. 2022-12-01 01:00:49 +01:00
alejandro.campos@artica.es 2c020bcd46 fixed vc template creation 2022-11-30 18:50:57 +01:00
Rafael Ameijeiras d96eb65b88 Merge branch 'ent-9952-500-al-editar-un-mapa-gis-php8' into 'develop'
Ent 9952 500 al editar un mapa gis php8

See merge request artica/pandorafms!5305
2022-11-30 15:59:55 +00:00
alejandro.campos@artica.es b4079bd557 fixed query errors 2022-11-30 16:52:40 +01:00
Daniel Maya 8bbfabb891 #9952 Fixed count error 2022-11-30 16:08:59 +01:00
Daniel Maya 5bca791021 #9954 Fixed table 2022-11-30 15:57:49 +01:00
Daniel Maya 8609028b4f #9937 Added ajax call 2022-11-30 14:40:41 +01:00
Daniel Rodriguez 229b29caa6 Merge branch 'ent-9880-14538-fallo-en-visualizacion-de-network-usage-map' into 'develop'
Ent 9880 14538 fallo en visualizacion de network usage map

See merge request artica/pandorafms!5300
2022-11-30 10:17:47 +00:00
artica a91546f51b Auto-updated build strings. 2022-11-30 01:00:15 +01:00
Daniel Maya 57bd23f94c #9873 Fixed images 2022-11-29 16:45:44 +01:00
Rafael Ameijeiras d39c014e0f Merge branch 'ent-9919-Contador-de-alertas-da-datos-erroneos' into 'develop'
changed wrong count

See merge request artica/pandorafms!5299
2022-11-29 15:10:10 +00:00
Daniel Maya c0e5706d85 #9880 Fixed network usage map 2022-11-29 15:41:10 +01:00
artica ab2a00b248 Auto-updated build strings. 2022-11-29 13:19:26 +01:00
artica 58ecdbd18e Updated version and build strings. 2022-11-29 13:18:16 +01:00
alejandro.campos@artica.es 2925df80e9 changed wrong count 2022-11-29 12:04:03 +01:00
alejandro.campos@artica.es 6243229345 changed wrong count 2022-11-29 11:54:25 +01:00
artica 64101bc837 Auto-updated build strings. 2022-11-29 01:00:19 +01:00
Diego Muñoz-Reja f6e880f84f Merge branch 'ent-9904-14470-Vista-erronea-tras-actualizacion' into 'develop'
fixed filter

See merge request artica/pandorafms!5293
2022-11-28 11:19:26 +00:00
Daniel Rodriguez 31e02467ce Merge branch 'ent-9927-anadir-nombre-de-release-lts-767-hope' into 'develop'
Ent 9927 anadir nombre de release lts 767 hope

See merge request artica/pandorafms!5297
2022-11-28 10:49:22 +00:00
Daniel Rodriguez 5809af9098 Merge branch 'ent-9894-error-500-ldap-con-php-function-php-8-0' into 'develop'
Ent 9894 error 500 ldap con php function php 8 0

See merge request artica/pandorafms!5290
2022-11-28 10:10:03 +00:00
Rafael Ameijeiras ee23bd1de8 Merge branch 'ent-9923-vista-de-setup-de-agentes-descuadrada-desplazada' into 'develop'
visual error pandora_enterprise#9923

See merge request artica/pandorafms!5294
2022-11-28 08:31:04 +00:00
Daniel Maya 306d0f0cf2 #9927 changed lts_name 2022-11-28 09:24:50 +01:00
José González 695f457a09 Fix issue with Database Lock. 2022-11-28 07:47:47 +00:00
artica c8df0dec0c Auto-updated build strings. 2022-11-28 01:00:16 +01:00
artica ca566d6d9b Auto-updated build strings. 2022-11-27 01:00:16 +01:00
artica f047f8bb14 Auto-updated build strings. 2022-11-26 01:00:19 +01:00
Daniel Barbero 117c2e6d5c visual error pandora_enterprise#9923 2022-11-25 14:12:11 +01:00
Rafael Ameijeiras ff82665da9 Merge branch 'ent-9901-no-se-visualizan-tags-en-tyr-saga-en-los-filtros-de-eventos' into 'develop'
Ent 9901 no se visualizan tags en tyr saga en los filtros de eventos

See merge request artica/pandorafms!5291
2022-11-25 12:29:01 +00:00
artica a276816bde Auto-updated build strings. 2022-11-25 01:00:18 +01:00
alejandro.campos@artica.es d170771905 fixed filter 2022-11-24 16:18:58 +01:00
Daniel Maya fcd918d00b #9851 Fixed background image size 2022-11-24 15:49:11 +01:00
Daniel Maya d59b587de2 #9901 Fixed tags 2022-11-24 14:04:10 +01:00
Rafael Ameijeiras bca50dc51c Merge branch 'ent-9900-Problemas-a-la-hora-de-añadir-perfiles-con-tags-en-tyr-y-parama' into 'develop'
minor fix

See merge request artica/pandorafms!5289
2022-11-24 11:46:14 +00:00
Rafael Ameijeiras f111191c86 Merge branch 'ent-9890-Error-en-masivas-de-modulos' into 'develop'
fix reference error

See merge request artica/pandorafms!5288
2022-11-24 11:45:37 +00:00
Daniel Maya 1ffac9bc80 #9894 Fixed ldap_search 2022-11-24 12:07:48 +01:00
alejandro.campos@artica.es 081e004381 minor fix 2022-11-24 11:45:26 +01:00
alejandro.campos@artica.es d564fc4022 fix reference error 2022-11-24 10:25:28 +01:00
artica 38259c9f8d Auto-updated build strings. 2022-11-24 01:00:20 +01:00
alejandro.campos@artica.es b9242b17d8 fixed bugs in meta profiles management 2022-11-23 16:29:27 +01:00
Daniel Rodriguez 33966c0ace Merge branch 'ent-9875-fallo-visual-en-el-filtro-de-eventos' into 'develop'
visual error pandora_enterprise#9875

See merge request artica/pandorafms!5282
2022-11-23 12:51:22 +00:00
alejandro.campos@artica.es cdddc07b86 changed mr 2022-11-23 12:22:19 +01:00
Jimmy Olano 38a6e59e6b Merge branch 'ent-9865-en-metaconsola-actualizar-la-notificacion-del-warp-update-para-php-8-a-partir-de-la-version-767' into 'develop'
Ent 9865 en metaconsola actualizar la notificacion del warp update para php 8 a partir de la version 767

Ref: pandora_enterprise#9865

See merge request artica/pandorafms!5285
2022-11-23 11:15:04 +00:00
Daniel Rodriguez 8e860d153b Merge branch 'ent-9874-editar-usuario-propio-admin-en-meta-da-un-error-500' into 'develop'
Ent 9874 editar usuario propio admin en meta da un error 500

See merge request artica/pandorafms!5286
2022-11-23 11:12:16 +00:00
Rafael Ameijeiras ce18775ac0 Merge branch 'ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea' into 'develop'
Ent 9501 tenencia de mismos permisos de manera simultanea

See merge request artica/pandorafms!5218
2022-11-23 10:03:19 +00:00
Daniel Rodriguez fd56904ef1 Merge branch 'ent-9499-Backup-BBDD-desde-la-consola-no-esta-borrando-las-antiguas' into 'develop'
fixed backup cron task

See merge request artica/pandorafms!5241
2022-11-23 09:49:09 +00:00
Daniel Rodriguez ba4112907d Merge branch 'ent-9494-post-busqueda-de-eventos-por-custom_data-no-permite-espacios-ni-mayusculas' into 'develop'
Ent 9494 post busqueda de eventos por custom data no permite espacios ni mayusculas

See merge request artica/pandorafms!5208
2022-11-23 09:47:55 +00:00
Daniel Rodriguez 0fb90e3383 Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop'
Fix events view XSS vulnerabilities

See merge request artica/pandorafms!5284
2022-11-23 09:46:52 +00:00
José González 001892ed5a Fix issue with empty autorefresh list 2022-11-23 09:42:12 +00:00
alejandro.campos@artica.es 743fef7d58 Merge remote-tracking branch 'origin/develop' into ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea 2022-11-23 10:30:59 +01:00
alejandro.campos@artica.es 5accae9d47 minor changes 2022-11-23 10:30:53 +01:00
Luis 4729a21636 Update php_message.php 2022-11-23 07:43:41 +00:00
artica 2ef560d1a9 Auto-updated build strings. 2022-11-23 01:00:20 +01:00