Commit Graph

28348 Commits

Author SHA1 Message Date
Jose Gonzalez 5b40a4f700 Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-23 08:50:50 +02:00
artica 0e34c1275a Auto-updated build strings. 2021-09-23 01:00:21 +02:00
Daniel Rodriguez 731c293b50 Merge branch 'ent-8000-error-autenticacion-ldap' into 'develop'
Fix io_safe_output for ldap admin pass

Closes pandora_enterprise#8000

See merge request artica/pandorafms!4414
2021-09-22 13:56:48 +00:00
Daniel Rodriguez 1aabb11c8c Merge branch 'ent-8032-giss-cambiar-comando-de-alerta-para-que-descarte-cualquier-string-que-no-parezca-una-direccion' into 'develop'
Add simple email address validation.

See merge request artica/pandorafms!4417
2021-09-22 12:33:18 +00:00
Daniel Rodriguez ea654fb323 Merge branch 'ent-7982-bug-en-edicion-de-correlacion-de-alertas' into 'develop'
Ent 7982 bug en edicion de correlacion de alertas

See merge request artica/pandorafms!4398
2021-09-22 12:32:23 +00:00
Jose Gonzalez 15ec0f4e4d Fix delete_files 2021-09-22 14:25:44 +02:00
Daniel Rodriguez 42700e9033 Merge branch 'ent-7785-input-email-con-fondo-blanco-y-texto-negro' into 'develop'
fixed visual error

See merge request artica/pandorafms!4284
2021-09-22 09:10:09 +00:00
Daniel Rodriguez ce286f2654 Merge branch 'ent-8003-bung-en-despliegue-de-tags-en-tree-view' into 'develop'
Fix tag treeview level2

See merge request artica/pandorafms!4407
2021-09-22 09:09:11 +00:00
Daniel Maya f3923326bc resolved conflict 2021-09-22 11:08:37 +02:00
Daniel Rodriguez c6e2fd6aa9 Merge branch 'ent-7993-bug-en-llamada-api-crear-alert-template-meta' into 'develop'
API set create alert template metaconsole support

See merge request artica/pandorafms!4401
2021-09-22 09:08:34 +00:00
Daniel Rodriguez 68b3255143 Merge branch 'ent-7583-traduccion-traduccion-del-apartado-de-la-consola-alerts-alert-correlation' into 'develop'
Css content moved to js to allow translation

See merge request artica/pandorafms!4400
2021-09-22 09:07:42 +00:00
Daniel Rodriguez 126030261b Merge branch 'ent-7969-Etiquetas-HTML-en-módulos-de-wizard-Consolas-Visuales' into 'develop'
Ent 7969 etiquetas html en módulos de wizard consolas visuales

See merge request artica/pandorafms!4394
2021-09-22 09:01:17 +00:00
Daniel Rodriguez 3338165dc3 Merge branch 'ent-7924-api-group-id-by-mname-falla-al-usar-url-encode-separator' into 'develop'
Fix api group_id_by_name with url enconde separator

See merge request artica/pandorafms!4391
2021-09-22 09:00:27 +00:00
Daniel Rodriguez c6da03316c Merge branch 'ent-7711-Fallo-al-mover-un-ítem-static-image-que-tuviera-vinculado-un-network-link' into 'develop'
Ent 7711 fallo al mover un ítem static image que tuviera vinculado un network link

See merge request artica/pandorafms!4346
2021-09-22 08:59:44 +00:00
Daniel Rodriguez f78d2e8a4b Merge branch 'ent-7697-varios-bugs-visuales-en-modal-de-configuracion-de-widget-metaconsola' into 'develop'
Fix widgets style bugs

See merge request artica/pandorafms!4272
2021-09-22 08:58:51 +00:00
artica 61e2a3f21b Auto-updated build strings. 2021-09-22 01:00:21 +02:00
Daniel Rodriguez a252bbedac Merge branch 'ent-7371-comportamiento-extrano-editor-ace' into 'develop'
Fixed monospaced

Closes pandora_enterprise#7371

See merge request artica/pandorafms!4273
2021-09-21 13:18:43 +00:00
Daniel Rodriguez b02ecc7cae Merge branch 'ent-7473-11796-mala-representacion-de-percentil-en-graficas-personalizadas' into 'develop'
fixed error with percentiles in graphs

See merge request artica/pandorafms!4312
2021-09-21 13:18:18 +00:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop'
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
2021-09-21 13:17:30 +00:00
Daniel Rodriguez 1ac070d35d Merge branch 'ent-7339-warning-module-templates' into 'develop'
Improve pen list handling

Closes pandora_enterprise#7339

See merge request artica/pandorafms!4263
2021-09-21 13:16:44 +00:00
Daniel Rodriguez 125f63a7a2 Merge branch 'ent-7695-eventos-con-entities-al-cambiar-info-de-eventos' into 'develop'
Fixed entities on text for custom events

See merge request artica/pandorafms!4235
2021-09-21 13:16:17 +00:00
Daniel Rodriguez 3e4fafadf8 Merge branch 'ent-8013-Consolas-Visuales-en-Metaconsola-rotas' into 'develop'
Ent 8013 consolas visuales en metaconsola rotas

See merge request artica/pandorafms!4421
2021-09-21 13:07:35 +00:00
artica d50cf7431b Auto-updated build strings. 2021-09-21 01:00:17 +02:00
Daniel Maya aef3e8affd #8013 Fixed percentile 2021-09-20 17:51:56 +02:00
Ramon Novoa 4a9cac6ef4 Add simple email address validation.
Add simple email address validation for internal email alerts. Prevents
connections to the SMTP server when no address is provided. Ref.
pandora_enterprise#8032.
2021-09-20 11:42:27 +02:00
artica 6153237481 Auto-updated build strings. 2021-09-20 01:00:17 +02:00
artica 43c22e9ec7 Auto-updated build strings. 2021-09-19 01:00:12 +02:00
artica 8d2d7f16de Auto-updated build strings. 2021-09-18 01:00:19 +02:00
Calvo 698ddd47df Fix api get group by id bug with or withouth url encode separator 2021-09-17 13:51:47 +02:00
Calvo 796f083730 Fix api get group by id bug 2021-09-17 11:52:30 +02:00
Jose Gonzalez 3af47c0e5f Open network maps 2021-09-17 10:45:01 +02:00
Daniel Maya 29012dc968 resolved conflict 2021-09-17 09:25:01 +02:00
artica 33788c9238 Auto-updated build strings. 2021-09-17 01:00:18 +02:00
Jose Gonzalez a1869fcef0 Fix io_safe_output for ldap admin pass 2021-09-16 12:08:46 +02:00
artica d7452d19e8 Auto-updated build strings. 2021-09-16 01:00:22 +02:00
artica 4cd17dca40 Auto-updated build strings. 2021-09-15 01:00:20 +02:00
Calvo e30fb70f11 Fix tag treeview level2 2021-09-14 13:03:38 +02:00
vgilc 538da5ff30 Merge branch 'ent-7998-actualizar-mr' into 'develop'
updated MR and current_package token

See merge request artica/pandorafms!4406
2021-09-14 10:24:44 +00:00
Calvo c1332a1064 updated MR and current_package token 2021-09-14 12:20:53 +02:00
artica cf3c328d18 Auto-updated build strings. 2021-09-14 01:00:17 +02:00
Daniel Rodriguez d41f240ea9 Merge branch '7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop'
moved to mr 49

See merge request artica/pandorafms!4404
2021-09-13 13:00:32 +00:00
alejandro.campos@artica.es ae2dc6a0b6 moved to mr 49 2021-09-13 14:54:33 +02:00
artica c231c82e93 Updated version and build strings. 2021-09-13 12:08:23 +02:00
vgilc 6184b3c1d4 Merge branch 'ent-7998-actualizar-mr' into 'develop'
Update Mr to 49

See merge request artica/pandorafms!4402
2021-09-13 08:52:37 +00:00
Calvo b039935470 Update Mr to 49 2021-09-13 10:45:22 +02:00
Calvo bb1e0a0b8b API set create alert template metaconsole support 2021-09-13 10:10:52 +02:00
artica 4ec67b51b7 Auto-updated build strings. 2021-09-13 01:00:16 +02:00
artica 4d2a52fcce Auto-updated build strings. 2021-09-12 01:00:13 +02:00
artica 48ee2d3fcd Auto-updated build strings. 2021-09-11 01:00:20 +02:00
Calvo 82e5b649d6 Css content moved to js to allow translation 2021-09-10 15:10:20 +02:00