tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,885 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

20885 Commits

Author SHA1 Message Date
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
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
artica f2873714a6 Auto-updated build strings. 2019-05-08 00:01:08 +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
Daniel Rodriguez 3b73ea95ae Merge branch 'ent-3940-No-salen-IPs-en-mapas-netflow' into 'develop' 
Fixed node name in netflow map

See merge request artica/pandorafms!2386

Former-commit-id: 14cf4f85a78b092fb7efe10a05e63702d4dbcbb2
 2019-04-30 17:53:48 +02:00
Daniel Rodriguez 5be813e210 Merge branch 'ent-3877-custom-field-view-faltan-los-enlaces-en-los-contadores' into 'develop' 
add links counters cfv

See merge request artica/pandorafms!2388

Former-commit-id: 8666427450be1b27f1c6b7ae08a3e9388e32aa97
 2019-04-30 17:50:33 +02:00
Daniel Maya c31948b7c2 Fixed netflow node name 
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
 2019-04-30 17:30:57 +02:00
Alejandro Fraguas 39786e4d32 Merge branch 'ent-3395-Añadir-un-componente-de-red-por-CLI' into 'develop' 
Added new functionality in CLI create_network_component

See merge request artica/pandorafms!2275

Former-commit-id: ca972d681e20579a32a1847bf4bfdce35f4f3de4
 2019-04-30 13:42:23 +02:00
artica 310d217fb2 Auto-updated build strings. 
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
 2019-04-30 00:01:09 +02:00
Daniel Barbero Martin 2aaeddd803 fixed errors IPAM subneting 
Former-commit-id: 58fb50dd594be993a1f17413ab9466d8588fa19a
 2019-04-29 16:42:26 +02:00
Daniel Barbero Martin 94932d23ac fixed error cfv status 
Former-commit-id: cccd14ea5d2e202124233372e3db47564b2d8475
 2019-04-29 15:43:51 +02:00
Daniel Rodriguez 6b54f0f998 Merge branch 'ent-2232-Checkbox-Opciones-para-los-informes2' into 'develop' 
changed in pandoradb

See merge request artica/pandorafms!2392

Former-commit-id: b8e5a5a8742aa9115389742a5c90944d5e55b0d6
 2019-04-29 15:11:21 +02:00
manuel 8dc3beaaa9 changed in pandoradb 
Former-commit-id: 8a9ccee718b24455fa21c7bfb38cf704c1aa2a0a
 2019-04-29 15:07:39 +02:00
alejandro-campos bcbcd763a1 fixed double load of events in event list 
Former-commit-id: ea1294c680b5dbe3b069110012e2b54db5312fd1
 2019-04-29 15:04:14 +02:00
Daniel Maya d16b96309b Fixed pagination in Alert templates 
Former-commit-id: 88def9abc66ae8fddceb97ec55823b92ddc1bb1f
 2019-04-29 14:45:11 +02:00
Daniel Rodriguez 9788a9f6d5 Merge branch 'visual-console-refactor' into 'develop' 
Visual console refactor: hotfixes

See merge request artica/pandorafms!2384

Former-commit-id: 59e435071a8cf94f4628ce04a77c00b42c65e4eb
 2019-04-29 12:43:42 +02:00
Daniel Maya a5379be0d9 Added refr in full screen and public visual console 
Former-commit-id: 348ec996173e95dce73e5800ece9c6861219c7af
 2019-04-29 12:09:40 +02:00
Alejandro Gallardo Escobar 5f986e2390 Visual Console Refactor: bugfix 
Former-commit-id: 2afef18813cc2a2d51a40bdf0a5c619bd0900b59
 2019-04-29 11:53:21 +02:00
Alejandro Gallardo Escobar 7f6ec7a501 Visual Console Refactor: bugfix 
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
 2019-04-29 11:03:56 +02:00
Alejandro Gallardo Escobar e5c17f660b Visual Console Refactor: fixed the label position 
Former-commit-id: d39b91f86c43e6e90f9287409635d331667d9551
 2019-04-29 10:56:06 +02:00
Alejandro Gallardo Escobar c09fbf4ddb Visual Console Refactor: fixed the links 
Former-commit-id: c37373329350c8b1ed421ae91f2a3c1e7d7f577a
 2019-04-29 10:45:12 +02:00
artica 5d6bd31786 Auto-updated build strings. 
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
 2019-04-29 00:01:06 +02:00
artica 141a042ee2 Auto-updated build strings. 
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
 2019-04-28 00:01:06 +02:00