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

21729 Commits

Author SHA1 Message Date
Daniel Rodriguez 4136f19190 Merge branch 'ent-4258-visual-console-movement-redimension-mode' into 'develop' 
Visual Console's movement and redimension mode

See merge request artica/pandorafms!2527
 2019-06-26 13:06:02 +02:00
Daniel Rodriguez 321ea717af Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop' 
Changed js

See merge request artica/pandorafms!2544
 2019-06-26 13:02:50 +02:00
marcos.alconada c223e0bdad Changed js 2019-06-26 12:50:19 +02:00
marcos.alconada 006e0cd4ec Changed js 2019-06-26 12:31:47 +02:00
Alejandro Fraguas 88ce26dee6 Merge branch 'ent-4141-Errores-en-el-Log-del-servidor' into 'develop' 
Fixed uninitialized value  in pattern match

See merge request artica/pandorafms!2542
 2019-06-26 12:23:42 +02:00
Daniel Rodriguez d68617eda1 Merge branch 'ent-4265-array-en-valor-min' into 'develop' 
Changed variable that modify min values

See merge request artica/pandorafms!2538
 2019-06-26 12:04:41 +02:00
Daniel Rodriguez 0ea5b7ff1b Merge branch 'ent-4196-Eliminar-funcionalidad-QR-Code-in-header' into 'develop' 
Removed option to show qr code in header - #4196

See merge request artica/pandorafms!2494
 2019-06-26 12:04:00 +02:00
Daniel Rodriguez 6a27778efb Merge branch 'ent-4204-error-al-editar-una-grafica-combinada-usando-previamente-un-filtro-de-busqueda' into 'develop' 
Ent 4204 error al editar una grafica combinada usando previamente un filtro de busqueda

See merge request artica/pandorafms!2505
 2019-06-26 12:03:13 +02:00
Daniel Rodriguez 6976ba9c8e Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop' 
Ent 3800 mal enrutamiento discovery

See merge request artica/pandorafms!2350
 2019-06-26 12:02:43 +02:00
artica ff48757077 Merge remote-tracking branch 'remotes/origin/ent-4141-Errores-en-el-Log-del-servidor' into develop 2019-06-26 11:36:22 +02:00
Alejandro Gallardo Escobar 2993278178 Removed the resize functionality of the module graph vc item 2019-06-26 11:33:45 +02:00
Alejandro Fraguas 7224974520 Merge branch 'ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion' into 'develop' 
first steps credential store

See merge request artica/pandorafms!2523
 2019-06-26 11:21:49 +02:00
fbsanchez 690b5cd7fd Merge branch 'fix/adblock-avoid' into 'develop' 
Fix class names to avoid addblock hide them

See merge request artica/pandorafms!2543
 2019-06-26 11:16:23 +02:00
fbsanchez f66e5b5ef8 Fix class names to avoid addblock hide them 2019-06-26 11:11:21 +02:00
fbsanchez fdf2a983d2 general review credential store 2019-06-26 10:39:18 +02:00
fbsanchez 4754e20784 Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-26 09:52:22 +02:00
Alejandro Fraguas 084c4cc651 Merge branch 'ent-4095-8090-cron-lock-ha' into 'develop' 
Added get_lock/release_lock functions to functions_db

See merge request artica/pandorafms!2526
 2019-06-26 09:24:58 +02:00
artica 9a65d8188a Auto-updated build strings. 2019-06-26 00:01:09 +02:00
Daniel Rodriguez 61e07abf3a Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop' 
Ent 4238 eventos csv e historico

See merge request artica/pandorafms!2515
 2019-06-25 18:33:49 +02:00
Daniel Rodriguez 35c914dc34 Merge branch 'ent-4181-7962-LDAP-no-parsea-Advanced-Permissions-LDAP' into 'develop' 
Fixed Advanced Permissions LDAP

See merge request artica/pandorafms!2521
 2019-06-25 18:21:42 +02:00
fbsanchez e1bf12a1fb Credential store 2019-06-25 18:21:23 +02:00
fbsanchez 8f914b69a6 Minor fixes 2019-06-25 17:24:16 +02:00
alejandro-campos 6dea559ab9 fix api return message 2019-06-25 17:06:11 +02:00
fbsanchez 22d936d4f3 credential store some js controls 2019-06-25 16:43:38 +02:00
fbsanchez 96ca26dc97 minor fix in event mass response process 2019-06-25 16:05:56 +02:00
Daniel Rodriguez 6af895b9c1 Merge branch 'ent-3999-No-se-ve-icono-SO-en-eventos-en-metaconsola' into 'develop' 
Added meta option in function ui_print_os_icon - #3999

See merge request artica/pandorafms!2502
 2019-06-25 16:04:51 +02:00
Daniel Maya ae4a9dc324 Fixed uninitialized value in pattern match 2019-06-25 15:33:19 +02:00
fbsanchez 4ec8299b0c Merge branch 'fix/alert-color' into 'ent-4238-eventos-csv-e-historico' 
Fix/alert color

See merge request artica/pandorafms!2541
 2019-06-25 15:31:44 +02:00
fbsanchez c5675ded4c fixed alert color 2019-06-25 15:24:42 +02:00
fbsanchez 004eb11048 MR29 2019-06-25 15:24:15 +02:00
Daniel Rodriguez 10aa0631af Merge branch 'ent-4208-Ayuda-vacia-modulos-unknown' into 'develop' 
Removed empty help in unknown modules - #4208

See merge request artica/pandorafms!2499
 2019-06-25 14:47:20 +02:00
Daniel Rodriguez b18de5cb1c Merge branch 'ent-4160-Fallo-visual-SNMP-browser' into 'develop' 
Fixed visual bug in snmp browser - #4160

See merge request artica/pandorafms!2531
 2019-06-25 14:46:25 +02:00
Luis Calvo f69fea81c2 Added satellite remote conficg check in snmp wizard 2019-06-25 14:28:33 +02:00
Daniel Rodriguez 01514ba5b6 Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop' 
Ent 3699 descuadre visual recuperar password

See merge request artica/pandorafms!2336
 2019-06-25 14:26:57 +02:00
Daniel Rodriguez 63eca254f6 Merge branch 'ent-3888-cambio-titulo-plugin-creation' into 'develop' 
changed title plugin creation to plugin registration

See merge request artica/pandorafms!2358
 2019-06-25 14:25:34 +02:00
fbsanchez 1966c81f2d Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-25 14:10:32 +02:00
Jose Gonzalez afd72eff42 Changed variable that modify min values 2019-06-25 13:37:44 +02:00
Daniel Rodriguez a3d0e3b55d Merge branch 'ent-4040-menu-resources-no-esta-resaltado-en-vista-de-agente' into 'develop' 
Condition is added to keep the selection color in the main menu

See merge request artica/pandorafms!2464
 2019-06-25 13:10:15 +02:00
Daniel Rodriguez 2ab7e26d07 Merge branch 'ent-3821-Option-servers-operator-read' into 'develop' 
Deleted Servers menu option for operator(read)

See merge request artica/pandorafms!2328
 2019-06-25 13:09:23 +02:00
fbsanchez 674c68bd2b avoided issue latin1 btoa javascript event transfer 2019-06-25 12:49:17 +02:00
fbsanchez 86600ca454 RSS menu filter loaded 2019-06-25 12:21:18 +02:00
Daniel Rodriguez c5be8e55ae Merge branch 'ent-3807-html-special-chars-conversion' into 'develop' 
Ent 3807 html special chars conversion

See merge request artica/pandorafms!2320
 2019-06-25 12:19:01 +02:00
fbsanchez fc0d9463d5 Fixed 2019-06-25 12:07:56 +02:00
Daniel Rodriguez 569bfa2329 Merge branch 'ent-3697-no-hay-opcion-a-ver-todos-los-grupos-con-permisos-correctos' into 'develop' 
Pending Q&A

See merge request artica/pandorafms!2262
 2019-06-25 12:06:07 +02:00
alejandro-campos 005540fef3 Merge remote-tracking branch 'origin/develop' into ent-3679-7637-7711-Agregar-eliminar-agente-de-politica-en-metaconsola 2019-06-25 11:46:52 +02:00
Daniel Rodriguez ea7e4892c3 Merge branch 'ent-4064-7999-pandora-ha-eventserver-alertas-duplicadas' into 'develop' 
HA related fixes to the Recon Server.

See merge request artica/pandorafms!2529
 2019-06-25 10:36:16 +02:00
fbsanchez a507d28c1f Update Aws agent names 2019-06-25 10:12:25 +02:00
Tatiana Llorente ea9540ddce Changed size for modal window for module graph- #4234 2019-06-25 09:19:47 +02:00
artica a469ff29da Auto-updated build strings. 2019-06-25 00:01:09 +02:00
fbsanchez 882aa67b3a aws multi account viewer rc1 2019-06-24 20:35:24 +02:00