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

14250 Commits

Author SHA1 Message Date
enriquecd e32a3e4a72 Make warning a critical limits fields not disabled for admin profile users - #824 2017-05-08 13:40:12 +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
vgilc b11865ccae Merge branch '782-Error-SQL-en-lista-de-alertas' into 'develop' 
Not use group filter sql if not exist filter_group data - #782

See merge request !412
 2017-04-27 16:31:45 +02:00
enriquecd a99eba3a45 Fill background vconsole widget with vconsole color source and fix vconsole size editor - #786 2017-04-27 13:28:49 +02:00
vgilc 3026089fd0 Merge branch 'ent-515-Macro-para-SO' into 'develop' 
Added macro _agentos_ to help actions

See merge request !416
 2017-04-27 11:17:03 +02:00
Daniel Maya 14e7d4b448 Fixed license failure 2017-04-27 10:49:54 +02:00
fermin831 36aa71df56 Added macro _agentos_ to help actions 2017-04-27 10:14:50 +02:00
artica 7493da21cc Auto-updated build strings. 2017-04-27 00:01:16 +02:00
vgilc e11acefe38 Merge branch '143-no-saca-correos-con-caracteres-no-ascii' into 'develop' 
fixed errors send email text-plain

See merge request !411
 2017-04-26 16:30:44 +02:00
vgilc da54680e04 Merge branch '785-No-carga-fondo-correcto-en-el-builder-de-las-consolas-visuales' into 'develop' 
Use real background-color in visual console builder - #785

See merge request !415
 2017-04-26 15:46:40 +02:00
enriquecd c2208e5e4a Use real background-color in visual console builder - #785 2017-04-26 13:01:38 +02:00
enriquecd d2b409d276 Not use group filter sql if not exist filter_group data - #782 2017-04-26 12:09:35 +02:00
daniel bf2485ec25 fixed errors send email text-plain 2017-04-26 12:00:08 +02:00
artica aa223aa583 Auto-updated build strings. 2017-04-26 00:01:15 +02:00
vgilc d10b0906ec Merge branch '141-cli-pandora-create_data_module' into 'develop' 
fixed error cli pandora-create_data_module

See merge request !405
 2017-04-25 17:17:39 +02:00
vgilc 1e5cf2d44e Merge branch '409-change-font-size-of-map-gis' into 'develop' 
Gis Maps Feature: When scrolling in map, change font-size of labels.

See merge request !360
 2017-04-25 16:27:37 +02:00
vgilc cdf95a47dd Merge branch '140-error-a-la-hora-de-duplicar-alertas-snmp' into 'develop' 
fixed error duplicate alert SNMP

Closes #140

See merge request !402
 2017-04-25 16:27:17 +02:00
vgilc 4040f024fa Merge branch '114-selector-multiple-muy-pequeno-en-graficas-de-agente' into 'develop' 
Make combobox of custom graph editor in agent view width adaptable - #114

See merge request !348
 2017-04-25 16:26:45 +02:00
vgilc 4b5da69e31 Merge branch '688-problema-acl-enterprise-workspace-2-7' into 'develop' 
Change sec url string in message and vconsole section - #688 - 2

See merge request !378
 2017-04-25 16:21:00 +02:00
vgilc 5e72afaec8 Merge branch '679-añadir-tooltips-a-opciones-de-una-recon' into 'develop' 
Added tooltips in recon

See merge request !335
 2017-04-25 16:19:09 +02:00
vgilc d420c98560 Merge branch 'ent-515-Macro-para-SO' into 'develop' 
Added macro _agentos_

See merge request !275
 2017-04-25 16:18:00 +02:00
vgilc a8d3ea7454 Merge branch '678-estadísticas-de-eventos-con-gráficas-desiguales' into 'develop' 
Fixed size graphs in event_statistics

See merge request !340
 2017-04-25 16:17:12 +02:00
vgilc 8802f1cdca Merge branch '605-ayuda-descolocada-modulos-webserver' into 'develop' 
Fixed text overflow in help window

See merge request !332
 2017-04-25 16:16:29 +02:00
vgilc ea6afb3701 Merge branch '681-Añadir-control-flotante-a-vistas-fullscreen' into 'develop' 
Added floating control in agents/modules, event list and snmp traps list

See merge request !351
 2017-04-25 16:15:41 +02:00
vgilc 48939e10e7 Merge branch '716-delete_all_checkbox_in_report_items' into 'develop' 
Added checkbox to selet all items in report (to delete them)

See merge request !366
 2017-04-25 16:06:34 +02:00
vgilc dfd0bb38e8 Merge branch '672-change_forums_url_in_wellcome_window' into 'develop' 
Changed forums url in wellcome window

See merge request !343
 2017-04-25 16:05:34 +02:00
artica 4113369680 Updated version and build strings. 2017-04-25 15:35:09 +02:00
daniel f6290d25fa fixed error cli pandora-create_data_module 2017-04-25 13:48:17 +02:00
vgilc ed2597fab7 Merge branch 'Borrado-1.sql-dev' into 'develop' 
deleted 1.sql

See merge request !403
 2017-04-25 10:42:26 +02:00
Daniel Maya bd5cda07c4 deleted 1.sql 2017-04-25 10:28:46 +02:00