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

14280 Commits

Author SHA1 Message Date
vgilc a2e728679e Merge branch '187-proteccion-en-cascada-por-modulo-integria-4112' into 'develop' 
Add support for per-module alert cascade protection.

See merge request !479
 2017-05-17 13:35:44 +02:00
Ramon Novoa 0d91a0ac22 Add support for per-module alert cascade protection. 2017-05-17 13:03:16 +02:00
artica 24915e47cb Updated version and build strings. 2017-05-17 12:08:40 +02:00
vgilc 7329215e30 Merge branch '876-Agentes-con-nuevos-nombres-hash-no-pueden-setearse-como-parent-dev' into 'develop' 
fixed problem with parent agents

See merge request !475
 2017-05-17 10:41:05 +02:00
Daniel Maya 1897ee59a3 fixed problem with parent agents 2017-05-17 10:34:35 +02:00
vgilc bd340f2327 Merge branch '854-no-estan-funcionando-modulos-snmp-mediante-wizard-interfaces' into 'develop' 
Add support for auto IP addresses to SNMP modules.

See merge request !473
 2017-05-17 09:26:51 +02:00
Ramon Novoa c317fa478c Add support for auto IP addresses to SNMP modules. 2017-05-17 08:09:00 +02:00
artica ead3556700 Auto-updated build strings. 2017-05-17 00:01:21 +02:00
vgilc 5e2a65d6b8 Merge branch '865-Compartir-consola-visual-Problemas-de-visibilidad-open' into 'develop' 
Hide scroll bars when vconsole is in fullscreen mode, also in dashboard when the…

See merge request !470
 2017-05-16 12:51:05 +02:00
enriquecd 71d868220a Hide scroll bars when vconsole is in fullscreen mode, also in dashboard when there is only one vconsole widget - #865 2017-05-16 12:36:58 +02:00
vgilc 754484cf1d Merge branch '689-Change_translations_in_mr_and_um_section' into 'develop' 
Translations changed

See merge request !344
 2017-05-16 12:05:50 +02:00
artu30 1546e48e15 Merge branch 'develop' into '689-Change_translations_in_mr_and_um_section' 
# Conflicts:
#   pandora_console/include/javascript/update_manager.js
 2017-05-16 11:57:58 +02:00
vgilc 88ccb3b364 Merge branch '875-alert-window-dont-work-dev' into 'develop' 
Fixed jquery request

See merge request !468
 2017-05-16 10:49:36 +02:00
Arturo Gonzalez 0346b49f1e Fixed jquery request 2017-05-16 10:42:41 +02:00
artica 63cc6f5244 Auto-updated build strings. 2017-05-16 00:01:15 +02:00
artica 45239e4cdd Auto-updated build strings. 2017-05-15 00:01:14 +02:00
artica 31970c521d Auto-updated build strings. 2017-05-14 00:01:14 +02:00
artica afff44138c Auto-updated build strings. 2017-05-13 00:01:16 +02:00
vgilc eccfad8a73 Merge branch '865-Compartir-consola-visual-Problemas-de-visibilidad' into 'develop' 
Fix background color, countdown refresh box, and make graphs dynamics - #865

See merge request !467
 2017-05-12 12:05:15 +02:00
enriquecd ab9930d4f3 Fix background color, countdown refresh box, and make graphs dynamics - #865 2017-05-12 11:41:45 +02:00
vgilc 03158ccc16 Merge branch 'weird-names-whe-apply-policies-7.0' into 'develop' 
Calculate md5 checksums byte by byte, not char by char!

See merge request !464
 2017-05-12 09:42:02 +02:00
artica 3d0c77709e Auto-updated build strings. 2017-05-12 00:01:25 +02:00
Ramon Novoa 6a83598c64 Calculate md5 checksums byte by byte, not char by char! 
(cherry picked from commit dc4d144de8)
 2017-05-11 16:22:11 +02:00
vgilc 31bc5e08a1 Merge branch '787-help-in-cascade-protection-dev' into 'develop' 
Changed help section in cascade protection help button and fixed help language.

See merge request !421
 2017-05-11 12:12:08 +02:00
artica 46e16f65ea Auto-updated build strings. 2017-05-11 00:01:21 +02:00
artica 71f8f29107 Auto-updated build strings. 2017-05-10 00:01:15 +02:00
artica ce179c39aa Auto-updated build strings. 2017-05-09 00:01:18 +02:00
vgilc fd6ff530c7 Merge branch '823-alert-action-fields-infinite-wait-dev' into 'develop' 
Changed bad jquery get call in alert actions and alerts snmp.

See merge request !441
 2017-05-08 17:30:02 +02:00
Arturo Gonzalez 600f4bc364 Changed bad jquery get call in alert actions and alerts snmp. 2017-05-08 15:54:35 +02:00
vgilc 93f6ad2e8d Merge branch '662-modulos-web-de-latencia-pasan-a-desconocido-ext-3807' into 'develop' 
Add a default timeout for web modules. Ref artica/pandora_enterprise#662.

See merge request !437
 2017-05-08 11:30:51 +02:00
artica 3865f13f8f Auto-updated build strings. 2017-05-08 00:01:14 +02:00
artica 3935442574 Auto-updated build strings. 2017-05-07 00:01:14 +02:00
artica 2c56de48f8 Auto-updated build strings. 2017-05-06 00:01:15 +02:00
Ramon Novoa 78e919a65e Add a default timeout for web modules. Ref artica/pandora_enterprise#662. 
(cherry picked from commit e49400ae15)
 2017-05-05 14:43:35 +02:00
artica 02e1c6c8d2 Auto-updated build strings. 2017-05-05 00:01:17 +02:00
vgilc c98638b965 Merge branch '681-Añadir-control-flotante-a-vistas-fullscreen-dev' into 'develop' 
Fix problem with filters in agents / modules

See merge request !432
 2017-05-04 17:35:54 +02:00
Daniel Maya eaf376094e Fix problem with filters in agents / modules 2017-05-04 17:12:32 +02:00
artica 96a13fe84c Auto-updated build strings. 2017-05-04 00:01:14 +02:00
vgilc 5ec5ad8982 Merge branch '802_fixed_errors_comunity_edition' into 'develop' 
fixed error icon comunity edition

See merge request !427
 2017-05-03 17:43:10 +02:00
daniel ade8931149 fixed error icon comunity edition 2017-05-03 17:29:27 +02:00
artica 8b3102f29a Auto-updated build strings. 2017-05-03 00:01:14 +02:00
artica 026c498c46 Auto-updated build strings. 2017-05-02 00:01:14 +02:00
artica 186fc2422e Auto-updated build strings. 2017-05-01 00:01:14 +02:00
artica 17437c197f Auto-updated build strings. 2017-04-30 00:01:13 +02:00
artica 36dd55148a Auto-updated build strings. 2017-04-29 00:01:14 +02:00
vgilc 77482670d6 Merge branch '784-Fallo-de-seguridad-critico.-Eliminación-de-licencia-dev' into 'develop' 
Fixed license failure

See merge request !418
 2017-04-28 13:32:13 +02:00
artica 682b7938ab Auto-updated build strings. 2017-04-28 00:01:15 +02:00
vgilc 2b5a0e4449 Merge branch '786-consolas-visuales-en-modo-full-screen-no-respetan-el-color-de-fondo-open-2' into 'develop' 
Disable dinamic image size input changer on vconsole editor mode - #786

See merge request !419
 2017-04-27 17:54:57 +02:00
enriquecd af5be1bfb0 Disable dinamic image size input changer on vconsole editor mode - #786 2017-04-27 17:32:28 +02:00
vgilc 211183e382 Merge branch '786-consolas-visuales-en-modo-full-screen-no-respetan-el-color-de-fondo-open' into 'develop' 
Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786

See merge request !417
 2017-04-27 17:24:59 +02:00