3773 Commits

Author	SHA1	Message	Date
nramon	c6dc5f9ee2	Merge branch 'develop' into 'pandora_enterprise#2333-intracom-snmp-trap-buffer-subsystem' ... # Conflicts: # pandora_server/lib/PandoraFMS/Config.pm	2018-08-08 11:27:56 +02:00
Ramon Novoa	90dd961fa1	Do not use quotemeta to escape arguments on win32. ... Ref pandora_enterprise#2625.	2018-08-08 11:24:50 +02:00
Ramon Novoa	892185a8ca	Style fix.	2018-08-08 10:09:48 +02:00
Ramon Novoa	27d1d1d745	Add support for trap data coming from XML files. ... Ref pandora_enterprise#2333.	2018-08-08 09:08:08 +02:00
artica	c6eef38ae8	Auto-updated build strings.	2018-08-08 00:01:22 +02:00
artica	e614e3ecec	Auto-updated build strings.	2018-08-07 00:01:22 +02:00
artica	1367d0e57e	Auto-updated build strings.	2018-08-06 00:01:22 +02:00
artica	e5e97a304b	Auto-updated build strings.	2018-08-05 00:01:21 +02:00
artica	517c98cf1a	Auto-updated build strings.	2018-08-04 00:01:25 +02:00
artica	392b5bc935	Auto-updated build strings.	2018-08-03 00:01:25 +02:00
artica	d06c0ebffe	Auto-updated build strings.	2018-08-02 00:01:23 +02:00
vgilc	86122be7e7	Merge branch '2488-ue-plugin-updates' into 'develop' ... Added extra compat. to print_module (plugintools) See merge request artica/pandorafms!1620	2018-08-01 15:20:55 +02:00
artica	1088c5390d	Auto-updated build strings.	2018-08-01 00:01:22 +02:00
artica	2dc5bc1139	Auto-updated build strings.	2018-07-31 00:01:23 +02:00
artica	42ad2cc924	Auto-updated build strings.	2018-07-30 00:01:22 +02:00
artica	258f6b915e	Auto-updated build strings.	2018-07-29 00:01:20 +02:00
artica	329bcdbc8b	Auto-updated build strings.	2018-07-28 00:02:05 +02:00
artica	284f992819	Auto-updated build strings.	2018-07-27 00:01:29 +02:00
artica	fb73a0b8b2	Auto-updated build strings.	2018-07-26 00:01:30 +02:00
vgilc	5bfeac1b87	Merge branch '1885-ue-configurador-automatico-de-agentes' into 'develop' ... Added DB changes to support ProvisioningServer 2 See merge request artica/pandorafms!1587	2018-07-25 11:21:51 +02:00
artica	b0434e7f1d	Auto-updated build strings.	2018-07-25 00:01:26 +02:00
fbsanchez	05bee8c856	Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes	2018-07-24 18:43:45 +02:00
artica	7748fcf5ce	Updated version and build strings.	2018-07-24 17:45:16 +02:00
daniel	65ff6b260c	fixed error pandoradb metapolicies	2018-07-24 13:12:46 +02:00
artica	33dd9d5886	Auto-updated build strings.	2018-07-24 00:01:28 +02:00
fbsanchez	079b2437b6	Merge remote-tracking branch 'origin/develop' into 1885-ue-configurador-automatico-de-agentes	2018-07-23 18:06:02 +02:00
vgilc	44ad0c31d5	Merge branch '2248-5730-Añadir-elementos-a-la-vista-de-eventos' into 'develop' ... Add items to the view events See merge request artica/pandorafms!1623	2018-07-23 11:22:23 +02:00
artica	63cc7aab9c	Auto-updated build strings.	2018-07-23 00:01:23 +02:00
artica	435d44a1ca	Auto-updated build strings.	2018-07-22 00:01:23 +02:00
artica	f67616a807	Auto-updated build strings.	2018-07-21 00:01:27 +02:00
Ramon Novoa	d102a588eb	Add module data and status information to events.	2018-07-20 13:50:56 +02:00
Ramon Novoa	34639ac5c4	Do not update tagente_estado when processing out-of-order data. ... Ref pandora_enterprise#6120.	2018-07-20 10:41:16 +02:00
artica	0557ecb508	Auto-updated build strings.	2018-07-20 00:01:30 +02:00
fbsanchez	82f3678fdd	Minor fix migrate_logs.pl no ticket	2018-07-19 16:38:15 +02:00
artica	a21892855a	Auto-updated build strings.	2018-07-19 00:01:32 +02:00
fbsanchez	3cc1f815ff	Added extra compat. to print_module (plugintools)	2018-07-18 17:56:35 +02:00
artica	9dafb653b4	Auto-updated build strings.	2018-07-18 00:01:27 +02:00
artica	fc885be510	Auto-updated build strings.	2018-07-17 00:01:27 +02:00
artica	74eecf1a96	Auto-updated build strings.	2018-07-16 00:01:21 +02:00
artica	04dfd30f76	Auto-updated build strings.	2018-07-15 00:01:27 +02:00
artica	4a7c329481	Auto-updated build strings.	2018-07-14 00:01:32 +02:00
artica	98025188cb	Auto-updated build strings.	2018-07-13 00:01:29 +02:00
daniel	86c21aea5d	merge develop	2018-07-12 13:37:46 +02:00
vgilc	dcad2ef9c7	Merge branch 'ent-2418-GIS-Activar-resolucion-GIS-en-creacion-de-agente-por-IP' into 'develop' ... Fixed recon_reverse_geolocation_file configuration See merge request artica/pandorafms!1611	2018-07-12 08:16:48 +02:00
artica	8ab387581d	Auto-updated build strings.	2018-07-12 00:01:56 +02:00
fermin831	ecd34f41f8	Fixed recon_reverse_geolocation_file configuration	2018-07-11 18:56:49 +02:00
Ramon Novoa	62ed69af90	Fix the service cascade protection.	2018-07-11 13:07:37 +02:00
artica	1df52459a6	Auto-updated build strings.	2018-07-11 00:01:28 +02:00
artica	49afdcb4fd	Auto-updated build strings.	2018-07-10 00:01:27 +02:00
vgilc	aaa00bd3ff	Merge branch 'ent-2418-GIS-Activar-resolucion-GIS-en-creacion-de-agente-por-IP' into 'develop' ... Ent 2418 gis activar resolucion gis en creacion de agente por ip See merge request artica/pandorafms!1599	2018-07-09 15:53:42 +02:00