Commit Graph

29238 Commits

Author SHA1 Message Date
artica 33788c9238 Auto-updated build strings. 2021-09-17 01:00:18 +02:00
fbsanchez 47633b4794 A better explanation 2021-09-16 21:57:23 +02:00
fbsanchez 187c6700b1 Simplified Entity 2021-09-16 21:54:12 +02:00
fbsanchez b33be80be3 Entity dynamic method calling improved 2021-09-16 21:16:49 +02:00
Calvo 0778952461 Merge remote-tracking branch 'origin/develop' into ent-7449-autorefresh-en-vistas-que-no-existen 2021-09-16 16:32:27 +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
fbsanchez 2e764afac7 PandoraHA Splitbrain autorecovery 2021-09-15 21:38:10 +02:00
Calvo 774e163ff0 Added title attr to module names in treeview 2021-09-15 17:41:51 +02:00
Calvo bd1e50dd48 Removed automatic assignation of PHP configuration variables 2021-09-15 12:20:40 +02:00
Calvo 0551b71d91 Fix services tree empty leaf visual bug 2021-09-15 10:35:02 +02:00
artica 4cd17dca40 Auto-updated build strings. 2021-09-15 01:00:20 +02:00
fbsanchez 8f7e49b0d1 CS fix in memory_limit detection (MC) 2021-09-14 18:59:15 +02:00
Calvo 5027e8c9a5 Fiex open report list view 2021-09-14 13:33:18 +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
Daniel Maya 3dc9165209 #7976 Fixed agent limit 2021-09-13 13:30:14 +02:00
Ramon Novoa 74ae4efa9a Add action information to alert events. 2021-09-13 13:13:46 +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
Daniel Rodriguez 4a8461c2d3 Merge branch 'ent-7885-12292-General-Report-no-ordena-como-debe' into 'develop'
Ent 7885 12292 general report no ordena como debe

See merge request artica/pandorafms!4378
2021-09-10 11:17:54 +00:00
Daniel Rodriguez 93b4d81264 Merge branch 'ent-7730-visualizacion-update-manager-en-tema-oscuro' into 'develop'
add update manager black background update manager

See merge request artica/pandorafms!4270
2021-09-10 11:11:24 +00:00
Daniel Rodriguez 8ea02ab4c2 Merge branch 'ent-7991-bug-selector-css' into 'develop'
Fix name for css

Closes pandora_enterprise#7991

See merge request artica/pandorafms!4397
2021-09-10 11:08:24 +00:00
Daniel Rodriguez 3100a72837 Merge branch 'ent-update-japanese-console-translation' into 'develop'
Updated Japanese console translations.

See merge request artica/pandorafms!4399
2021-09-10 10:56:36 +00:00
Jose Gonzalez a774d67f2a Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-10 12:50:23 +02:00
Junichi Satoh 1c3ec719d7 Updated Japanese console translations. 2021-09-10 17:57:44 +09:00
Marcos Alconada 2ed5be71d6 Resolve conflict 2021-09-10 08:04:23 +00:00
Marcos Alconada 99a47b0739 set style on um-last and next button 2021-09-10 07:49:40 +00:00
Daniel Maya 10f1894b82 #7982 Added id_template_fields and id_template_conditions 2021-09-10 09:46:00 +02:00
Jose Gonzalez 316611f432 Fix name for css 2021-09-10 09:25:01 +02:00
artica 12b7cd0c63 Auto-updated build strings. 2021-09-10 01:00:21 +02:00
Daniel Rodriguez 75e432afa0 Merge branch 'ent-7967-anadir-alert-correlation-a-meta' into 'develop'
Ent 7967 anadir alert correlation a meta

See merge request artica/pandorafms!4389
2021-09-09 10:56:50 +00:00
Daniel Rodriguez 1a66858020 Merge branch 'ent-7984-falla-chequeo-de-acls-en-la-api' into 'develop'
Fixed API access

See merge request artica/pandorafms!4395
2021-09-09 08:07:15 +00:00
artica f2875b5a86 Auto-updated build strings. 2021-09-09 01:00:24 +02:00
fbsanchez 34adf6e9e2 Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card 2021-09-08 21:21:45 +02:00
fbsanchez 6f50aed48d Some improvements 2021-09-08 19:48:20 +02:00
Daniel Rodriguez a18fd6ab0f Merge branch 'ent-7706-descuadre-texto-e-icono-de-los-botones' into 'develop'
fixed icon button position

See merge request artica/pandorafms!4243
2021-09-08 14:40:34 +00:00
Daniel Rodriguez 2e7dadb04e Merge branch 'ent-7591-mensaje-error-timeout-snmp-en-browser' into 'develop'
Fix format on snmp browser error messages

See merge request artica/pandorafms!4276
2021-09-08 14:37:14 +00:00
Daniel Maya 0aa14b1a7f #7967 Fix rules 2021-09-08 15:53:57 +02:00
Daniel Rodriguez 3b5545cde4 Merge branch 'ent-7720-bug-visual-en-correlacion-de-alertas' into 'develop'
fixed error

See merge request artica/pandorafms!4244
2021-09-08 13:35:45 +00:00