7415 Commits

Author	SHA1	Message	Date
vgilc	c9a431d2c9	Merge branch '972-added-disabled-agents-to-policy-agents-selects-dev' into 'develop' ... Added disabled option to get ggroup agents function See merge request !782	2017-09-11 09:51:39 +02:00
vgilc	da0294b872	Merge branch '1245-Anadir-resumen-de-grupos-como-elemento-de-consola-visual' into 'develop' ... Add show_statistics option for group item - #1245 See merge request !766	2017-09-11 09:45:45 +02:00
vgilc	813825a5be	Merge branch '1223-Entidades-pendientes-dev' into 'develop' ... Added degree in io_safe_input See merge request !805	2017-09-11 09:44:14 +02:00
vgilc	4096a0f5ff	Merge branch '1122-Revision-del-estilo-CSS-de-las-paginas-de-ayuda' into 'develop' ... Change pandora help window style - #1122 See merge request !741	2017-09-11 09:43:39 +02:00
vgilc	ae0196f7b5	Merge branch '1169-Pandora-FMS-Aplicación-movil-Error-en-ordenacion-de-eventos' into 'develop' ... Fix bad ordination in mobile pandora events list - #1169 See merge request !746	2017-09-11 09:41:56 +02:00
vgilc	71e737e059	Merge branch '977-module-data-string-format-dev' into 'develop' ... Added new format to string data See merge request !786	2017-09-11 09:40:53 +02:00
vgilc	4457b3d849	Merge branch '1079-interfaces-when-agent-comes-to-satellite-dev' into 'develop' ... Added function to get all interfaces See merge request !764	2017-09-11 09:38:52 +02:00
vgilc	6bf85a0789	Merge branch '1070-disable-interface-links-in-fictional-nodes-dev' into 'develop' ... Removed interface link function in fictional nodes See merge request !644	2017-09-11 09:35:35 +02:00
vgilc	d7eb182dca	Merge branch '1084-Conteo-de-vista-tactica-dev' into 'develop' ... Fixed module counter See merge request !641	2017-09-11 09:25:47 +02:00
vgilc	99fa1d0aad	Merge branch '1216-error-in-edit-networkmaps-open-dev' into 'develop' ... Fixed combo in editor See merge request !747	2017-09-11 09:19:59 +02:00
artica	291871fae0	Auto-updated build strings.	2017-09-11 00:01:20 +02:00
artica	e651f64c85	Auto-updated build strings.	2017-09-10 00:01:18 +02:00
artica	cc36e2756f	Auto-updated build strings.	2017-09-09 00:01:22 +02:00
daniel	8a7b0a0f79	fixed errors in new macro graph treshold	2017-09-08 13:55:03 +02:00
Daniel Maya	1a56c78808	Added degree in io_safe_input	2017-09-08 12:39:00 +02:00
vgilc	2689213fdf	Merge branch '1181-add-short-data-option-to-charts-dev' into 'develop' ... Added option to short data or not See merge request !785	2017-09-08 10:29:53 +02:00
vgilc	b4f0cf12ae	Merge branch '1060-Letras-blancas-en-fondo-blanco-con-Black-theme-7' into 'develop' ... Change pandorin dialog font color with black theme - #1060 See merge request !635	2017-09-08 10:02:45 +02:00
artica	7f3539ecf0	Auto-updated build strings.	2017-09-08 00:01:19 +02:00
daniel	f2f9cc666e	boolean graphs	2017-09-07 18:11:42 +02:00
Arturo Gonzalez	598b04c2db	Added a change to boolean charts	2017-09-07 16:17:41 +02:00
vgilc	3d2948d7eb	Merge branch '1198-errors-in-boolean-chart-third-time-dev' into 'develop' ... Updated module chart code See merge request !796	2017-09-07 15:29:29 +02:00
Arturo Gonzalez	da117723ef	Updated module chart code	2017-09-07 15:19:03 +02:00
Arturo Gonzalez	c986e4fad7	Added minor change to boolean charts	2017-09-07 14:45:20 +02:00
Arturo Gonzalez	2fba19d55c	Added some changes in boolean charts	2017-09-07 11:14:06 +02:00
artica	80027e4d8c	Auto-updated build strings.	2017-09-07 00:01:31 +02:00
artica	c4a709acf1	Updated version and build strings.	2017-09-06 17:22:32 +02:00
artica	ce4d898deb	Auto-updated build strings.	2017-09-06 00:01:18 +02:00
Arturo Gonzalez	ad2cf22fa4	Added new format to string data	2017-09-05 17:33:38 +02:00
Arturo Gonzalez	5664c72f8b	Added option to short data or not	2017-09-05 16:23:21 +02:00
Arturo Gonzalez	ba292e5009	Added conf to wmi modules in policies	2017-09-05 15:04:41 +02:00
Arturo Gonzalez	1dae698333	Added disabled option to get ggroup agents function	2017-09-05 13:40:57 +02:00
daniel	4430a7b2fe	fixed errors in autocomplete field	2017-09-05 12:35:21 +02:00
Daniel Maya	b6c44db3cd	Merge branch 'develop' into '125-Gestión-recolección-y-correlación-de-logs-dev' ... # Conflicts: # pandora_server/lib/PandoraFMS/Config.pm	2017-09-05 10:00:24 +02:00
artica	924518e02b	Auto-updated build strings.	2017-09-05 00:01:21 +02:00
Daniel Maya	c6d216df07	update functions_config with Number of logs viewed	2017-09-04 18:00:06 +02:00
vgilc	09f92b51ae	Merge branch '832-server-proxy-final-details-dev' into 'develop' ... Added last specifications to pandora exec proxy See merge request !775	2017-09-04 16:33:11 +02:00
Arturo Gonzalez	018f449fc8	Added last specifications to pandora exec proxy	2017-09-04 16:02:58 +02:00
daniel	a04e02570f	Merge branch 'develop' into 1056-pandora-wux-grid-server	2017-09-04 14:09:08 +02:00
daniel	f0862e1c5b	fixed minor errors in WUX	2017-09-04 12:09:19 +02:00
artica	9169cff0b5	Auto-updated build strings.	2017-09-04 00:01:13 +02:00
artica	b35ffc84ba	Auto-updated build strings.	2017-09-03 00:01:13 +02:00
artica	f2cf38a3dd	Auto-updated build strings.	2017-09-02 00:01:14 +02:00
nramon	13894ba403	Merge branch '832-server-proxy-details-dev' into 'develop' ... Added details to agent wizard and secundary servers See merge request !770	2017-09-01 11:36:53 +02:00
daniel	d74a3f74b4	Merge branch 'develop' into 1056-pandora-wux-grid-server	2017-09-01 10:51:54 +02:00
Arturo Gonzalez	a80f62003c	Added details to agent wizard and secundary servers	2017-09-01 10:44:26 +02:00
artica	cce7f496b6	Auto-updated build strings.	2017-09-01 00:01:14 +02:00
slerena	601db73596	Merge branch '1177-Graficas_con_valores_negativos_rev2' into 'develop' ... fixed error values negatives in reports pdf See merge request !769	2017-08-31 18:16:26 +02:00
slerena	ec1b95d45a	Merge branch 'Alta-de-nueva-macro-_id_module_-ayuda-1072' into 'develop' ... Add _id_module_ definition to help - #1072 See merge request !757	2017-08-31 18:07:09 +02:00
daniel	b0263a8806	fixed error values negatives in reports pdf	2017-08-31 16:52:41 +02:00
Arturo Gonzalez	d0715bed51	Removed unused styles	2017-08-31 16:08:24 +02:00