Commit Graph

27499 Commits

Author SHA1 Message Date
Daniel Rodriguez c39d013afb Merge branch 'ent-7227-Perfil-LM-no-permite-modificar-acciones-ni-templates' into 'develop'
Ent 7227 perfil lm no permite modificar acciones ni templates

See merge request artica/pandorafms!3980
2021-05-06 12:22:48 +00:00
Daniel Maya c003964394 Ent 7227 perfil lm no permite modificar acciones ni templates 2021-05-06 12:22:47 +00:00
Daniel Barbero Martin 51f38f3589 WIP command center 2021-05-06 14:22:39 +02:00
Daniel Rodriguez 1e0eabdbf7 Merge branch 'ent-7114-no-se-puede-realizar-llamada-api-add-user-profile-modo-all' into 'develop'
Fixed api add user profile with group all

See merge request artica/pandorafms!3974
2021-05-06 12:19:23 +00:00
Daniel Rodriguez 5efb331568 Merge branch 'ent-7140-vista-agents-alerts-salta-vista-principal' into 'develop'
Fixed agents/alerts view group change when public url foreced

See merge request artica/pandorafms!4108
2021-05-06 12:17:38 +00:00
Daniel Rodriguez 0371a9acd6 Merge branch 'ent-7218-filtrado-erroneo-tree-view' into 'develop'
Fixed treeview filter by module status

See merge request artica/pandorafms!3981
2021-05-06 12:14:16 +00:00
Daniel Rodriguez 8e737502c5 Merge branch 'ent-7133-texto-ingles-discovery' into 'develop'
Fixed text

Closes pandora_enterprise#7133

See merge request artica/pandorafms!3976
2021-05-06 12:10:21 +00:00
Daniel Rodriguez f33384931e Merge branch 'ent-7108-API-get-all-agents-no-filtra-por-alias' into 'develop'
Ent 7108 api get all agents no filtra por alias

See merge request artica/pandorafms!3944
2021-05-06 12:07:49 +00:00
Daniel Rodriguez 325e400b11 Merge branch 'ent-7109-Bug-al-duplicar-alertas-snmp' into 'develop'
Ent 7109 bug al duplicar alertas snmp

See merge request artica/pandorafms!3934
2021-05-06 12:07:16 +00:00
Daniel Rodriguez dd014596d6 Merge branch 'ent-7117-Guardar-puerto-al-crear-network-component-desde-el-SNMP-Browser' into 'develop'
Ent 7117 guardar puerto al crear network component desde el snmp browser

See merge request artica/pandorafms!3943
2021-05-06 12:06:21 +00:00
Daniel Rodriguez db92b65fd0 Merge branch 'ent-7211-errores-visuales-en-la-vista-de-agente' into 'develop'
resolved error with sql message error external tools2

See merge request artica/pandorafms!3979
2021-05-06 12:05:04 +00:00
Rafael Ameijeiras 2a37c695ed Merge branch 'ent-7463-adding-deploy-improves' into 'develop'
fixing oracle dependencies variable ref

See merge request artica/pandorafms!4109
2021-05-06 07:26:16 +00:00
rafael.ameijeiras ad8f967b32 fixing oracle dependencies variable ref 2021-05-06 09:23:44 +02:00
Daniel Barbero Martin d5dcc5bf69 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-06 08:30:30 +02:00
artica 6c87f65367 Auto-updated build strings. 2021-05-06 01:00:44 +02:00
Calvo dec202ed78 Fixed agents/alerts view group change when public url foreced 2021-05-05 17:53:52 +02:00
alejandro.campos@artica.es aa4769d331 minor changes 2021-05-05 13:02:53 +02:00
fbsanchez 735df105d3 Mute some license checks while initializing enterprise component (pandora-ha) 2021-05-05 12:40:56 +02:00
José González 6570441fd2 Fixed issue with type 2021-05-05 12:05:06 +02:00
alejandro.campos@artica.es d358fd894d minor change in integria ims setup 2021-05-05 11:03:32 +02:00
alejandro.campos@artica.es e28c6377de remove log input 2021-05-05 10:35:00 +02:00
alejandro.campos@artica.es 256750bcb0 fixed bug in file attachment 2021-05-05 09:51:21 +02:00
José González 385366a9e1 Merge branch 'develop' into 'ent-7184-duplicate-web-server-module'
# Conflicts:
#   pandora_console/include/functions_modules.php
2021-05-05 07:37:02 +00:00
marcos 25867a0fd7 fixed visual error black theme 2021-05-05 09:36:16 +02:00
marcos 1f5e08a9fe fixed wrong string 2021-05-05 09:23:47 +02:00
Daniel Barbero Martin 2495611249 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-05 08:30:48 +02:00
artica 20466ec0d1 Auto-updated build strings. 2021-05-05 01:00:40 +02:00
Daniel Barbero Martin 55a1ea6f2a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-04 17:19:35 +02:00
José González e49edc93d6 Fixed missed parameter 2021-05-04 13:48:13 +02:00
artica f0f7244d84 Auto-updated build strings. 2021-05-04 01:00:33 +02:00
artica 5461a4391c Auto-updated build strings. 2021-05-03 01:00:36 +02:00
artica 2494aad730 Auto-updated build strings. 2021-05-02 01:00:30 +02:00
artica 13483e6952 Auto-updated build strings. 2021-05-01 01:00:31 +02:00
Daniel Rodriguez 50c61b2f9f Merge branch 'ent-7426-fallo-de-reglas-de-eventos-en-metaconsola' into 'develop'
Migrate old rules

See merge request artica/pandorafms!4093
2021-04-30 13:35:56 +00:00
fbsanchez 34b02982e1 Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag 2021-04-30 15:01:43 +02:00
fbsanchez e179475663 Repaired group selector in rules 2021-04-30 14:54:14 +02:00
José González 0dc1ec449c Added standard headers 2021-04-30 14:44:03 +02:00
fbsanchez 366e9a08d5 minor fix 2021-04-30 14:36:47 +02:00
José González dbb7fe364f Added standard headers 2021-04-30 14:35:54 +02:00
fbsanchez 6b83deacdd Migrate old rules 2021-04-30 14:34:10 +02:00
vanessa gil 97e7e8c8cb Updated version. 2021-04-30 13:57:00 +02:00
José González ab984b8c32 Added standard headers 2021-04-30 13:50:58 +02:00
José González cea27392c8 Added standard header 2021-04-30 13:39:10 +02:00
José González 46a691c397 Added standard headers 2021-04-30 13:24:55 +02:00
Daniel Rodriguez 299842beda Merge branch 'ent-7265-cambios-minimos-en-css-black-them-sancho' into 'develop'
fixed visual error black theme 754 LTS

See merge request artica/pandorafms!4092
2021-04-30 10:43:22 +00:00
Marcos Alconada c5fe67ddb5 fixed visual error black theme 754 LTS 2021-04-30 10:43:22 +00:00
José González 3f33a0ec29 Added standard header 2021-04-30 12:35:02 +02:00
José González 71c88313d5 Added standard header 2021-04-30 10:58:37 +02:00
vanessa gil f51ad33554 Updated version. 2021-04-30 10:34:20 +02:00
Daniel Barbero Martin a20809b95d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-30 08:28:17 +02:00