Commit Graph

5870 Commits

Author SHA1 Message Date
Daniel Rodriguez f12f3d6cf4 Merge branch 'ent-7915-Error-SQL-en-filtro-de-custom-field-en-informe-de-inventario-de-agentes' into 'develop'
Ent 7915 error sql en filtro de custom field en informe de inventario de agentes

See merge request artica/pandorafms!4375
2021-08-31 10:05:31 +00:00
Daniel Rodriguez fae4b284e4 Merge branch 'ent-7945-500-al-crear-informe' into 'develop'
Ent 7945 500 al crear informe

See merge request artica/pandorafms!4373
2021-08-27 12:07:24 +00:00
Daniel Rodriguez 16fff8b2f5 Merge branch 'ent-7619-cambiar-parametros-lanzar-snmpwalk-configuracion-modulo' into 'develop'
Change snmpwalk behaviour in module configuration

Closes pandora_enterprise#7619

See merge request artica/pandorafms!4221
2021-08-27 10:45:42 +00:00
Daniel Maya c4e6c52fe2 #7915 fixed custom field filter 2021-08-27 11:24:23 +02:00
Daniel Rodriguez c172afe1ce Merge branch 'ent-7940-Bug-items-de-informes-en-open' into 'develop'
Ent 7940 bug items de informes en open

See merge request artica/pandorafms!4372
2021-08-26 10:13:13 +00:00
Daniel Maya 0a79014480 #7495 fixed report name 2 2021-08-26 12:03:14 +02:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop'
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
2021-08-25 13:00:42 +00:00
Daniel Rodriguez 61baf63a6a Merge branch 'ent-7819-500-al-ordernar-items-de-informes' into 'develop'
fixed error 500 when sort report items

See merge request artica/pandorafms!4314
2021-08-25 12:52:33 +00:00
Daniel Rodriguez 3be8971360 Merge branch 'ent-7887-Vulnerabilidad-xss-en-operaciones-masivas-de-módulos' into 'develop'
Ent 7887 vulnerabilidad xss en operaciones masivas de módulos

See merge request artica/pandorafms!4365
2021-08-25 12:52:06 +00:00
Daniel Maya c8fb8a441f #7940 Fixed server filter in open 2021-08-25 13:43:13 +02:00
Daniel Rodriguez 8a574a2f93 Merge branch 'ent-7920-metacosola-gestion-de-usuarios-locales' into 'develop'
Re-enabled user management in MC while not in centralised environment

See merge request artica/pandorafms!4369
2021-08-24 12:28:03 +00:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop'
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
2021-08-24 08:13:02 +00:00
Daniel Rodriguez 3dc6db320e Merge branch 'ent-7725-bug-en-creacion-de-itmes-sla' into 'develop'
Fixed SLA report items creating empty extra item

See merge request artica/pandorafms!4253
2021-08-23 10:50:10 +00:00
fbsanchez 4ff6b8a1bb Re-enabled user management in MC while not in centralised environment 2021-08-23 12:29:17 +02:00
marcos 244d7f6c8b solved conflicts 2021-08-23 08:25:12 +02:00
Daniel Maya 9488ce873b #7887 Fixed xss in massive modules 2021-08-19 12:57:16 +02:00
Daniel Rodriguez 44dcdb03bc Merge branch 'ent-7542-11882-Buscador-de-acciones-no-funciona' into 'develop'
Ent 7542 11882 buscador de acciones no funciona

See merge request artica/pandorafms!4343
2021-08-17 07:09:26 +00:00
alejandro.campos@artica.es 21e15752cf fixed select2 search in action update 2021-08-16 11:04:52 +02:00
fbsanchez 93636aef96 Avoid warning phpcs 2021-08-12 12:00:53 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez 03306454e0 Merge branch 'ent-7883-aplicacion-de-parches-offline-en-la-open' into 'develop'
Allowed UMC offline for opensource installations, fixed issue while accessing settings

See merge request artica/pandorafms!4349
2021-08-11 12:20:32 +00:00
fbsanchez 3662d8b8a0 Added offline entry to menu in community ed 2021-08-11 14:12:49 +02:00
fbsanchez c69c326bc5 Warning to be careful with offline patches 2021-08-11 11:34:29 +02:00
fbsanchez 97afb02ba6 Allowed UMC offline for opensource installations, fixed issue while accessing settings 2021-08-11 11:28:33 +02:00
fbsanchez cf976f9622 Merge remote-tracking branch 'origin/develop' into ent-7861-fallo-umc-cuando-hay-db-historico
Conflicts:
	pandora_console/godmode/um_client/index.php
2021-08-11 09:56:02 +02:00
Daniel Rodriguez f8e9bd38ec Merge branch 'ent-7633-selector-de-grupos-en-el-graph-builder-de-las-custom-graphs-ocupa-todo-el-ancho-de-la-pantalla' into 'develop'
colspan 1 to group selector custom graph

See merge request artica/pandorafms!4223
2021-08-11 07:10:50 +00:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop'
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
2021-08-10 12:19:54 +00:00
Daniel Rodriguez b3336cdc4f Merge branch 'ent-7563-bug-carga-dinamica-icono-grupos-creacion-agente' into 'develop'
Fixed group icon on agent creation

See merge request artica/pandorafms!4145
2021-08-10 07:00:56 +00:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop'
fixed xss vulnerability

See merge request artica/pandorafms!4196
2021-08-09 08:59:44 +00:00
Daniel Maya a5f9e74b50 #7881 Fixed snmp alert 2021-08-05 15:53:44 +02:00
Daniel Rodriguez e623fa1822 Merge branch 'ent-7854-warning-por-memoria-php-umc-cuando-vale-1' into 'develop'
Minor fix in memory detection UMC

See merge request artica/pandorafms!4327
2021-08-05 11:51:39 +00:00
alejandro.campos@artica.es 5acd64bbf7 fixed text inputs in add action modals 2021-08-05 13:05:53 +02:00
Daniel Rodriguez 39d4466658 Merge branch 'ent-fix-alert-action-creation' into 'develop'
Fixed alert action creation problem.

See merge request artica/pandorafms!4313
2021-08-05 07:56:22 +00:00
Daniel Rodriguez e2a1a42006 Merge branch 'ent-7592-componentes-remotos-de-red-campo-tcp-send' into 'develop'
Unset field tcp send when snmp remote component selected

See merge request artica/pandorafms!4160
2021-08-04 12:03:52 +00:00
Daniel Rodriguez 801f8fc3c4 Merge branch 'ent-7615-hide-en-los-comandos-de-alertas' into 'develop'
Fixed alert command hide on update

See merge request artica/pandorafms!4164
2021-08-03 06:47:41 +00:00
Daniel Rodriguez 2963d67225 Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop'
Improve code for get secondary groups

Closes pandora_enterprise#7767

See merge request artica/pandorafms!4259
2021-08-02 07:18:02 +00:00
fbsanchez b88b019528 errata fix0 2021-07-29 13:15:01 +02:00
fbsanchez 41f2842e41 Proxy fix and some traceability for DBH upgrade 2021-07-29 13:11:45 +02:00
fbsanchez cea9d2ae3d Fix searchpath for MR while updating 2021-07-28 19:16:27 +02:00
fbsanchez 9206dc491e avoid notice but accept any other alert from PHP 2021-07-27 11:24:23 +02:00
fbsanchez 3c78bfc89e Changed LOAD por SOURCE in UMC - MR loader 2021-07-27 10:48:12 +02:00
fbsanchez 60de51cfdb Minor fix in memory detection UMC 2021-07-27 10:21:52 +02:00
fbsanchez dc7d30cbf8 Stupid sexy error_get_last 2021-07-22 11:41:04 +02:00
fbsanchez d3270904bd Avoid notice 2021-07-22 11:33:57 +02:00
fbsanchez f83fddb4ff Always ignopre undefined indexes notices 2021-07-22 11:29:01 +02:00
fbsanchez 52059661a4 Ignore undefined indexes E_NOTICE 2021-07-22 10:59:19 +02:00
fbsanchez f71ae73c84 Load procedures (or complex queries) in UMC 2021-07-21 17:31:03 +02:00
marcos e02dd1b61f fixed error 500 when sort report items 2021-07-21 11:43:11 +02:00
Junichi Satoh 4115bd0cba Fixed an issue where alert actions belonging to the "All" group could be created by restricted users. 2021-07-21 15:34:46 +09:00
fbsanchez d3fe504241 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-13 13:14:01 +02:00