Commit Graph

20925 Commits

Author SHA1 Message Date
marcos.alconada ff8abf9b40 updated function for show and hide ehorus form
Former-commit-id: 91c91ee7b1014dfa4d8f7719cb848ae4770199f5
2019-05-14 15:34:22 +02:00
marcos.alconada b51cdb93df arreglo con la vista del formulario
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
2019-05-10 15:00:21 +02:00
marcos.alconada 793304b52d Se habilita el boton de ehorus
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
2019-05-10 12:26:09 +02:00
marcos.alconada 72eb2babad se quita install.php
Former-commit-id: 34ab35a67b924c6d0aab9f756a0c73bffd36c8cd
2019-05-09 17:44:54 +02:00
marcos.alconada e0729b6ca6 Se vuelve a crear la rama
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
2019-05-09 14:59:47 +02:00
Daniel Rodriguez c775d0359c Merge branch 'ent-3973-al-hacer-update-de-un-comando-persiste-valor-antiguo-de-los-campos-al-refrescar-la-vista' into 'develop'
Show new values after update

See merge request artica/pandorafms!2405

Former-commit-id: aa2b2a4857e47a4999ef9ca42f6ba1b59fa9d714
2019-05-09 14:36:51 +02:00
Daniel Rodriguez 7c3e883c01 Merge branch 'ent-3770-texto-del-pandora-diag' into 'develop'
Ent 3770 texto del pandora diag

Closes pandora_enterprise#3529, pandora_enterprise#1744, pandora_enterprise#3305, pandora_enterprise#3121, and pandora_enterprise#3252

See merge request artica/pandorafms!2393

Former-commit-id: d78409acd362ebc5308495c359344f5b706685cd
2019-05-09 13:01:28 +02:00
Alejandro Fraguas 0aa8bcda30 Merge branch 'ent-3758-7777-bug-validacion-eventos-en-consola' into 'develop'
Pending to review

See merge request artica/pandorafms!2295
2019-05-09 11:56:29 +02:00
Daniel Rodriguez c7c7a8457f Merge branch 'ent-3952-6601-aadcm-fallo-visual-en-pdf-report-sla-semanal' into 'develop'
fixed errors pdf SLA Weekly

See merge request artica/pandorafms!2410
2019-05-09 11:05:54 +02:00
artica 7da73afd08 Auto-updated build strings. 2019-05-09 00:01:10 +02:00
Daniel Rodriguez 8f6c8a9932 Merge branch 'ent-3613-Ventana-modal-de-vista-de-Eventos' into 'develop'
Ent 3613 ventana modal de vista de eventos

See merge request artica/pandorafms!2387
2019-05-08 19:07:39 +02:00
Daniel Barbero Martin 1644b492d2 fixed errors pdf SLA Weekly 2019-05-08 18:29:33 +02:00
Daniel Rodriguez 0a7539cc3a Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop'
fixed filemanager

See merge request artica/pandorafms!2408
2019-05-08 18:26:23 +02:00
Daniel Rodriguez ac101af72f Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop'
Added module units in module graphs

See merge request artica/pandorafms!2237
2019-05-08 16:36:43 +02:00
Alejandro Fraguas 4b7f9e4882 Merge branch 'ent-3884-Error-Superredes' into 'develop'
fixed errors IPAM subneting

See merge request artica/pandorafms!2395
2019-05-08 15:57:53 +02:00
marcos.alconada 0b118f63ad Merge remote-tracking branch 'origin/develop' into ent-3758-7777-bug-validacion-eventos-en-consola 2019-05-08 15:19:40 +02:00
marcos.alconada 1ffc6bd028 Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
2019-05-08 14:36:04 +02:00
marcos.alconada 645730f11f Merge remote-tracking branch 'refs/remotes/origin/ent-3770-texto-del-pandora-diag' into ent-3770-texto-del-pandora-diag
Former-commit-id: b273f92815e176976254a8c67cb0edd34e4bf9ca
2019-05-08 14:35:00 +02:00
Daniel Rodriguez 0ebf89a9eb Merge branch 'ent-3533-Mostrar-Contact-en-informacion-de-los-eventos' into 'develop'
Show contact in events information

See merge request artica/pandorafms!2373
2019-05-08 14:13:08 +02:00
Daniel Rodriguez 0c8fab6cb3 Merge branch 'ent-3574-7598-bug-botones-y-casillas-vista-de-eventos' into 'develop'
Ent 3574 7598 bug botones y casillas vista de eventos

See merge request artica/pandorafms!2222
2019-05-08 13:52:45 +02:00
Daniel Rodriguez 72a127c085 Merge branch 'ent-3773-fallo-paginacion-templates-alerts' into 'develop'
Fixed pagination in Alert templates

See merge request artica/pandorafms!2391
2019-05-08 13:40:18 +02:00
Daniel Rodriguez d9e0d44a66 Merge branch 'ent-3782-module-visualization-bug' into 'develop'
Added unknown status image

See merge request artica/pandorafms!2314
2019-05-08 13:34:41 +02:00
Daniel Rodriguez f13162abf1 Merge branch 'ent-3802-visual-constole-warning-state-bug' into 'develop'
Fixed select bug not selectig value

See merge request artica/pandorafms!2346
2019-05-08 13:17:02 +02:00
Daniel Rodriguez 247605f308 Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop'
Eliminated the cache when update agents

See merge request artica/pandorafms!2242
2019-05-08 12:50:40 +02:00
Luis Calvo ef1149d3bb Fixed get agent status on linked map 2019-05-08 12:39:53 +02:00
Luis Calvo 5b75b671aa Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-08 12:37:10 +02:00
Ramon Novoa a9bf83cc5b Fix the call to docker build to always build the latest image. 2019-05-08 11:22:07 +02:00
Alejandro Fraguas 297f53b9de Merge branch 'ent-3608-Update-Manager-Online' into 'develop'
Ent 3608 update manager online

See merge request artica/pandorafms!2379
2019-05-08 11:20:12 +02:00
Daniel Maya 610e0dabbf Merge branch 'develop' into ent-3773-fallo-paginacion-templates-alerts 2019-05-08 11:17:15 +02:00
Daniel Barbero Martin 99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
artica f2873714a6 Auto-updated build strings. 2019-05-08 00:01:08 +02:00
marcos.alconada fa14fa9510 Show new values after update 2019-05-07 17:47:47 +02:00
Luis Calvo 954aac3aeb Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-07 17:13:54 +02:00
Luis Calvo 3221bcf55a Merge remote-tracking branch 'origin/develop' into ent-3782-module-visualization-bug 2019-05-07 16:08:29 +02:00
Ramon Novoa a92f81272a Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop 2019-05-07 15:05:03 +02:00
Ramon Novoa 10fd9c4b57 Merge branch 'ent-3755-Vista-de-eventos-se-carga-dos-veces' into develop 2019-05-07 15:02:47 +02:00
Alejandro Fraguas 547348440f Merge branch '206-anadido-soporte-para-aix-en-plugin-de-inventario' into 'develop'
Resolve "Añadido soporte para AIX en plugin de inventario"

See merge request artica/pandorafms!2294
2019-05-07 14:57:09 +02:00
Alejandro Fraguas 0a96cfd696 Merge branch 'ent-3819-Bug-en-vista-monitor-details-con-tags' into 'develop'
Fixed bug in monitor detail view

See merge request artica/pandorafms!2360

Former-commit-id: fcbe351e4a71b0827fa7e4919a3b4ae8ffa956bb
2019-05-07 10:17:37 +02:00
artica 9116a72a2b Auto-updated build strings.
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
2019-05-07 00:01:09 +02:00
Alejandro Fraguas 11a16e4c2a Merge branch 'ent-3408-snmp-component-creation-api' into 'develop'
Fixed wrong array index for id_group

See merge request artica/pandorafms!2286

Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
2019-05-06 17:00:29 +02:00
alejandro-campos a622dcc9d4 add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
2019-05-06 15:06:26 +02:00
Alejandro Fraguas 545afcb684 Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop'
Added secondary groups in global search

See merge request artica/pandorafms!2351

Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
2019-05-06 10:33:30 +02:00
artica 6d7b748591 Auto-updated build strings.
Former-commit-id: 0110fd44ff110c73a9bdb427e7a017258a48bfa8
2019-05-06 00:01:06 +02:00
artica 83b6fe5a55 Auto-updated build strings.
Former-commit-id: 24f76ce9d15cf44952fe148ff48f6017b5798942
2019-05-05 00:01:07 +02:00
artica 168ee6cdc6 Auto-updated build strings.
Former-commit-id: 0a99a82af6cebf9b798329e52e44819825c0bb05
2019-05-04 00:01:07 +02:00
Daniel Rodriguez 16f687574e Merge branch 'ent-3847-Bug-en-edicion-de-modulos-locales-posible-condicion-especial' into 'develop'
Fixed bug in unlinked modules

See merge request artica/pandorafms!2347

Former-commit-id: 32bea7e188131ae6115f6c45012dafe648f811cd
2019-05-03 12:41:01 +02:00
manuel e424a2a684 Fixed bug in unlinked modules edition
Former-commit-id: ec9ee4ecbc53a5c617aaf2cee52f7cbbf8f94da8
2019-05-03 12:14:23 +02:00
artica b88456f696 Auto-updated build strings.
Former-commit-id: 21d8c77dbdf5653b73aed9a83b833ec8dc5cb243
2019-05-03 00:01:06 +02:00
artica 828d7830a5 Auto-updated build strings.
Former-commit-id: 646717be2ca7b947dc8acf0c9db4b8e4ab7762b0
2019-05-02 00:01:06 +02:00
artica a9e0acd3e1 Auto-updated build strings.
Former-commit-id: e2dcdd18fd18f75cff8c27ebd69b40940186166b
2019-05-01 00:01:10 +02:00