1232 Commits

Author	SHA1	Message	Date
José González	02475d25b6	Merge branch 'develop' into 'ent-1175-copyright-actualizados' ... # Conflicts: # pandora_console/general/header.php # pandora_console/general/sap_view.php	2020-12-23 06:48:22 +01:00
alejandro-campos	f03b4e59f8	several fixes in netscan custom	2020-12-18 11:40:22 +01:00
Daniel Rodriguez	7a67412398	Merge branch 'ent-6698-Demos-de-consolas-visuales-sin-el-token-Legacy-Visual-Console-aparecen-vacias' into 'develop' ... fix inserts demo VC See merge request artica/pandorafms!3638	2020-12-17 17:02:42 +01:00
vanessa gil	5763948625	Updated version.	2020-12-14 13:52:54 +01:00
Jose Gonzalez	649442f794	Updated copyrights	2020-11-27 13:52:35 +01:00
Daniel Maya	fc83121969	Changed event criticity	2020-11-26 13:22:59 +01:00
alejandro-campos	b36d03a19d	changed mail to admin default action	2020-11-26 09:44:56 +01:00
Daniel Barbero Martin	564b389603	fix inserts demo VC	2020-11-23 13:49:59 +01:00
Marcos Alconada	8e4c62a0e9	fixed error	2020-10-29 18:20:33 +01:00
daniel	3455de7f85	fixed visual errors and default values	2020-10-07 16:03:52 +02:00
daniel	a5d5a45cac	add render graph to reports	2020-10-02 14:16:55 +02:00
Daniel Rodriguez	ccbbd7909b	Merge branch 'ent-6342-10704-wmi-errores-modulos-nuevos-cpu-disk-services-etc' into 'develop' ... Ent 6342 10704 wmi errores modulos nuevos cpu disk services etc See merge request artica/pandorafms!3475	2020-09-30 10:25:32 +02:00
Kevin	b1c4a9890e	Merge branch 'master' of brutus.artica.es:artica/pandorafms into ent-6022-uptime-incorrecto-en-politica-mejorada-windows	2020-09-25 11:46:08 +02:00
fbsanchez	04aa92ca0d	Updated field number for WMI checks (new installations)	2020-09-22 10:35:56 +02:00
fbsanchez	c43c331d58	pandoradb_data.sql review, column selected in wmi modules	2020-09-21 18:13:18 +02:00
daniel	b96cade165	new options 24x7 sla,availavility reports	2020-08-31 12:33:41 +02:00
Jose Gonzalez	3c0ea8b08a	Solved issues with DB	2020-08-10 15:10:17 +02:00
Jose Gonzalez	35644a367f	Added ttag modifies	2020-08-10 14:53:07 +02:00
fbsanchez	5df418d226	MR changes	2020-07-09 16:56:51 +02:00
José González	311b259684	Backup upload	2020-06-30 12:16:51 +02:00
Kevin Rojas	ca019d1909	Update pandoradb_data.sql	2020-06-17 17:34:38 +02:00
Kevin Rojas	a8cf1550ce	Fix Uptime module	2020-06-17 17:26:20 +02:00
vanessa gil	71e64e7e43	Updated MR version.	2020-06-02 19:22:50 +02:00
artica	c127ed84f0	Updated version and build strings.	2020-06-02 18:19:16 +02:00
alejandro-campos	1140a4345a	added new module type	2020-05-04 12:20:50 +02:00
Kike	801624b8a2	Deleted [RT] tag for recon templates	2020-04-07 14:04:06 +02:00
Kike	d908a9f7f6	Added default modules templates for recon tasks	2020-04-02 19:12:49 +02:00
daniel	709201bf23	dashboards	2020-03-26 12:29:38 +01:00
alejandro-campos	e05c292d7d	show last status change of module	2020-03-23 12:47:58 +01:00
Daniel Barbero	19b571fc78	update version	2020-03-03 10:17:18 +01:00
artica	015b1b55b2	Updated version and build strings.	2020-03-02 11:01:26 +01:00
Tatiana Llorente	c820a32b53	Ent 4492 consola visual por paises	2020-02-28 14:37:44 +01:00
Daniel Maya	30e1021877	Fixed conflict in tpolicies	2020-02-28 08:51:00 +01:00
Daniel Maya	9f01356b6f	conflict resolved	2020-02-24 09:49:25 +01:00
Daniel Rodriguez	b0f0ef3f98	Merge branch 'policies-rework' into 'develop' ... Replaced old policies with reworked ones See merge request artica/pandorafms!3060	2020-02-21 13:51:17 +01:00
Kevin	e6ff0b22ac	Added missing information to Solaris policy	2020-02-21 10:27:20 +01:00
Daniel Maya	4e4c1495eb	Fixed merge conflict	2020-02-20 15:07:14 +01:00
Daniel Maya	87dc92ffd9	Ent 5457 suid nodos elastic	2020-02-18 13:24:22 +01:00
Kevin	15a4bd0763	Replaced old policies with reworked ones	2020-02-14 11:18:21 +01:00
Daniel Maya	1e4217d1c6	Changed Inserts in tpolicy	2020-02-13 09:22:57 +01:00
Daniel Maya	baecac1efb	Next mr	2020-01-29 15:51:39 +01:00
artica	2f6fed368d	Updated version and build strings.	2020-01-29 10:13:37 +01:00
Alejandro Campos	0468c85a4d	Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' ... # Conflicts: # pandora_console/godmode/setup/setup_visuals.php	2020-01-07 12:00:27 +01:00
daniel	3dbdfdb6eb	Fix Landscape reports	2019-12-11 15:07:38 +01:00
Luis	6ba4a26564	Added timeoout option to command event responses	2019-12-10 11:54:30 +01:00
alejandro-campos	5880bec88a	changes in module data formatting when printed across the application and new setup options	2019-12-05 17:41:44 +01:00
daniel	960326b980	Add menu omnishell	2019-11-21 18:21:46 +01:00
fbsanchez	446d6c3507	Fix windows commands	2019-11-20 12:35:55 +01:00
Daniel Barbero Martin	1b5dcc3e28	Fixed errors in remote command	2019-11-19 12:35:52 +01:00
fbsanchez	f4f618c1da	Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl	2019-11-05 15:40:14 +01:00
fbsanchez	58cbc3c738	Merge remote-tracking branch 'origin/develop' into ent-EDF ... Conflicts: pandora_console/extras/mr/33.sql pandora_console/pandoradb_data.sql	2019-11-05 15:17:09 +01:00
fbsanchez	ec3c7ba559	Some remote command examples	2019-11-04 20:36:03 +01:00
Alejandro Fraguas	777bbdd180	Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop' ... Added feature sample_agent See merge request artica/pandorafms!2826	2019-11-04 17:54:33 +01:00
fbsanchez	383967f68a	Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF	2019-10-29 16:56:01 +01:00
fbsanchez	6478c7a51f	minor tips quickshell	2019-10-29 15:55:39 +01:00
fbsanchez	7accbc97c4	Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl	2019-10-28 12:36:19 +01:00
artica	3094d5af05	Updated version and build strings.	2019-10-28 12:35:59 +01:00
Jose Gonzalez	b0db7c729d	Solved minor issues	2019-10-24 16:23:58 +02:00
Jose Gonzalez	29bcd379f7	Added changes for liking with visual consoles	2019-10-24 11:53:35 +02:00
fbsanchez	6bf3772690	remote cmd => remote execution	2019-10-09 19:20:58 +02:00
Daniel Barbero	8af72c1c9d	add Remote CMD	2019-10-09 17:26:06 +02:00
Daniel Barbero Martin	2ee725b204	fixed minor error	2019-09-26 16:43:31 +02:00
artica	574d9b13d6	Updated version and build strings.	2019-09-26 16:32:58 +02:00
alejandro-campos	96622933fc	added new section in integria setup to configure different options for event responses and alert created tickets	2019-09-26 13:22:10 +02:00
Alejandro Campos	20cebbe988	Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria' ... # Conflicts: # pandora_console/extras/mr/32.sql	2019-09-23 17:16:15 +02:00
alejandro-campos	9bf2980f01	fix minor bugs in integria integration	2019-09-23 12:48:20 +02:00
Marcos Alconada	6107d141c0	Update pandoradb_data.sql	2019-09-19 12:40:53 +02:00
Marcos Alconada	a468c79a67	Changed visual console ID	2019-09-04 10:05:44 +02:00
marcos.alconada	b18f72dcdd	Add new visual console Host Alive Keep Alive	2019-09-03 13:04:12 +02:00
Daniel Maya	5ad22620b9	mr power up	2019-08-28 12:49:41 +02:00
Alejandro Fraguas	23cdc419a9	Merge branch 'ent-4397-visual-console-racks-branch2' into 'develop' ... Ent 4397 visual console racks branch2 See merge request artica/pandorafms!2650	2019-08-19 13:55:51 +02:00
artica	c0588d95ca	Updated version and build strings.	2019-08-13 12:27:44 +02:00
Luis Calvo	72c4b55477	Corregida errata comentario	2019-08-09 10:52:25 +02:00
Luis Calvo	4fe4e58874	Re-uploaded visual-console rack images and db data	2019-08-09 10:46:47 +02:00
Luis Calvo	0cb0a63a8f	Re-uploaded visual-console rack images and db data	2019-08-09 10:42:44 +02:00
Alejandro Campos	12eacc1933	Merge branch 'develop' into 'ent-4388-Nuevos-eventos' ... # Conflicts: # pandora_console/extras/mr/31.sql # pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql	2019-08-05 09:26:18 +02:00
alejandro-campos	927b1fa37f	removed all deprecated references to integria from code and db data	2019-07-31 16:46:26 +02:00
alejandro-campos	b4bd7f0f63	fixed problems in event view and event view custom fields	2019-07-30 16:10:34 +02:00
Daniel Barbero Martin	0064bc0cba	fixed errors	2019-07-01 17:07:39 +02:00
Daniel Barbero Martin	a10cf51b1b	update current package	2019-06-26 15:37:04 +02:00
marcos.alconada	1e843777bc	Delete line with log4x	2019-06-07 10:57:15 +02:00
Marcos Alconada	d49d303469	Update pandoradb_data.sql	2019-06-07 10:20:29 +02:00
Marcos Alconada	be82afc9c5	Update pandoradb_data.sql	2019-06-07 09:50:49 +02:00
Marcos Alconada	241eda5c39	Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'" ... This reverts merge request !2282	2019-06-07 09:35:13 +02:00
marcos.alconada	a13dab3f35	resolving merge conflict	2019-06-07 09:22:07 +02:00
fbsanchez	5e9b2479eb	Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager	2019-05-20 13:11:39 +02:00
fbsanchez	ec60a3193a	removed all group from communications target ... Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67	2019-05-16 12:52:41 +02:00
fbsanchez	3bf06f0b72	MR minor updates ... Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c	2019-05-15 00:00:21 +02:00
fbsanchez	8004e096fd	MR 28 and minor fixes ... Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25	2019-05-14 18:09:34 +02:00
fbsanchez	920786216b	UM notifications MR update ... Former-commit-id: 61be93c1174fbff4242e261caac591725d7ef4c5	2019-05-14 17:17:04 +02:00
Marcos Alconada	cf45be2c60	Merge branch 'develop' into 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' ... # Conflicts: # pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql Former-commit-id: b3872691ef8ef136cd921c5eb4365be2b32daf46	2019-05-14 10:03:37 +02:00
marcos.alconada	9501187ebc	Se cambian las consultas sql sin la imagen en la consulta ... Former-commit-id: fcfc9e05c4107f5b85b1a8f6140155fafe316c8e	2019-05-14 10:01:30 +02:00
marcos.alconada	ac60e296c1	Add new message to News board ... Former-commit-id: ad9170857d95fa2c211d09a5f59f6012739177c5	2019-05-10 11:17:46 +02:00
manuel	12c9952e4a	Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal ... Conflicts: pandora_console/extras/mr/28.sql Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a	2019-05-10 09:11:17 +02:00
marcos.alconada	8dc2644368	Deleted default insert on tevent_response ... Former-commit-id: 33fb686679fa89afbf0834e1e434739d11bfc4dd	2019-04-29 12:36:37 +02:00
manuel	c075d5caad	Added condition type not normal in alert templates ... Former-commit-id: c2028e4c64e4126768f33f73edb93b39fdf6a79d	2019-04-24 10:51:55 +02:00
fbsanchez	79bd37ee5b	Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3 ... Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7	2019-04-08 16:28:26 +02:00
fbsanchez	798a2aad16	WIP discovery F3 ... Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939	2019-04-03 18:13:19 +02:00
fbsanchez	11b2fbc245	WIP db ... Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9	2019-04-02 16:25:29 +02:00
marcos.alconada	9d4d2e65cf	Resolved ticket with sql sentence ... Former-commit-id: de4b92ab338dccb9fa720a61a2ff98f263128401	2019-03-22 11:20:32 +01:00
marcos.alconada	9bc536396d	Resolved ticket with sql sentence ... Former-commit-id: 959c27837ca824f386fe3b3ee43005a8235e4197	2019-03-22 10:20:41 +01:00
alejandro-campos	67d24860d1	Merge remote-tracking branch 'origin/ent-3610-Vista-Edicion-de-Usuario' into ent-3595-discovery-fase-2 ... Former-commit-id: 8a9d1b18d9d3894f2ef7823d3b5624b5c7f59088	2019-03-20 15:46:33 +01:00
manuel	6121c2a32b	Added types reports to send email ... Former-commit-id: 7d2f349c47d81de454cb5464146d4f0ac2fc3fb6	2019-03-19 17:16:31 +01:00
fbsanchez	750c64fbd7	Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 ... Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7	2019-03-13 09:52:00 +01:00
manuel	c41c9d10e0	Changed sql files ... Former-commit-id: b9b20d2a5aee08ca1638df9bdb8e16c3b693d47b	2019-03-08 10:01:55 +01:00
fbsanchez	41138fbfbb	discovery tasks assimilate cron ... Former-commit-id: d373a07b50f6ba8ac106dbeee4a84d9a0635464f	2019-03-01 15:26:05 +01:00
daniel	e55e47cbfa	change mr ... Former-commit-id: 4ec37be9caef34e88b3e5ca65bca2c1aee7f03dd	2019-02-27 11:35:00 +01:00
artica	26560c734c	Updated version and build strings. ... Former-commit-id: 39df6ee0aee9f29c9afb8729f9e95b316ca8cd67	2019-02-27 11:25:50 +01:00
Daniel Maya	16f1474691	Added models in tlog_graph_models ... Former-commit-id: 76d6f1358677c02eab4681a1bb290fda0476c91b	2019-02-25 17:45:37 +01:00
fbsanchez	d8ee90c285	Merge remote-tracking branch 'origin/develop' into ent-3430-discovery ... Former-commit-id: cd7b77b0fe8fa41f03024af752b8793ae877de2b	2019-02-25 14:42:48 +01:00
fbsanchez	e65d128b25	minor fix db schema ... Former-commit-id: a4f87c1c7fd9da0f16a37f75cb5029ac6694baef	2019-02-22 12:40:02 +01:00
fbsanchez	42448cf0d8	Updated path for discovery plugins ... Former-commit-id: 222373efee3c768619d5f301f3ae291009901e64	2019-02-22 10:41:54 +01:00
fbsanchez	e856969a59	Minor fix changed vmware_plugin reference to vmware-plugin ... Former-commit-id: 20e80bfffaf80583c320aa62d35e54f79e6ab03e	2019-02-21 15:13:27 +01:00
fbsanchez	8fb84e910a	Minor SQL fixes discovery ... Former-commit-id: e2513e61ea6038f0bdb8f009619dcb92f07b992e	2019-02-21 14:29:59 +01:00
fbsanchez	c12ba3b12e	Minor MR and sql updates - presets ... Former-commit-id: edf310a362b58c68dcadbb078b899948430f23e3	2019-02-21 13:58:29 +01:00
fbsanchez	eb3adfb6fb	Data update. added recon scripts app.vmware and cloud ... Former-commit-id: 1fa41a16848794846fee6b5da510bd49aa7b51b1	2019-02-20 17:17:24 +01:00
alejandro-campos	e4ca9b7fc8	Merge branch 'develop' into 3281-Vista-monitor-detail-personalizar-campos-a-mostrar ... Former-commit-id: 1683307f273ba5676ec61709403249b24113c47f	2019-02-15 14:22:55 +01:00
fbsanchez	166c3bbe88	Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora ... Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2	2019-02-12 12:41:11 +01:00
fbsanchez	42dc0c60be	supervisor ... Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e	2019-02-12 11:41:21 +01:00
fbsanchez	d40ced2043	alert_command send notification ... Former-commit-id: ff0eb13b51cdab9c2d188362da0c8b2c4191b2cf	2019-02-12 11:16:34 +01:00
fbsanchez	681ad67028	ConsoleSuperviso - mailing support and minor fixes ... Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4	2019-02-07 18:00:51 +01:00
fbsanchez	cf5716e569	supervisor added subtype to tmensajes ... Former-commit-id: 650e7317a4fea4e44be850af1156024297396a16	2019-02-07 12:56:48 +01:00
daniel	d0fe6c9ecf	fixed mr token ... Former-commit-id: ab5615c8eb0f1a2b153934b807d23804f4fd5562	2019-01-30 17:11:48 +01:00
fbsanchez	dc3d7cc5e2	notifications, first approach db schema ... Former-commit-id: 1142c65f175c13eaaff9b26a9887f4ef519e9612	2019-01-30 11:56:21 +01:00
artica	cec6aedaf5	Updated version and build strings. ... Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44	2019-01-29 11:08:54 +01:00
alejandro-campos	2155420d71	implement custom fields for node monitor view ... Former-commit-id: d9dd515a726d1fa7cc5855b016270b9ef083cb6f	2019-01-18 11:13:29 +01:00
daniel	01a9621eb5	Custom fields view add new filters	2018-12-03 11:36:34 +01:00
daniel	a7918a1816	delete field flash chart php7	2018-10-19 11:56:49 +02:00
daniel	ffc7734ebc	delete flash_charts and library pchart	2018-10-19 11:31:06 +02:00
fermin831	8196ed21df	New mr 21.sql commit	2018-09-18 18:55:53 +02:00
vgilc	080cfb20ca	Merge branch 'develop' into '1979-5352-plugin-de-monitorizacion-log-apache-dev' ... # Conflicts: # pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql	2018-09-17 14:44:24 +02:00
danielmaya	50a3e43bd4	Insert apache log model in tlog_graph_models	2018-09-17 12:43:51 +02:00
artica	c54f414a73	Updated version and build strings.	2018-09-13 15:53:21 +02:00
daniel	cb77a299bb	add templates console visual	2018-08-01 09:58:48 +02:00
artica	7748fcf5ce	Updated version and build strings.	2018-07-24 17:45:16 +02:00
daniel	17b726d7a0	changes bd for mr, schema and migrate and update tocken mr	2018-06-21 14:15:27 +02:00
Ramon Novoa	dc103988ae	Fix the current enterprise package number.	2018-06-20 15:18:50 +02:00
Ramon Novoa	7a026bd1c0	Update the MR version.	2018-06-20 14:40:47 +02:00
Alejandro Gallardo Escobar	faccbec12d	Added a new inventory module to the database	2018-06-19 15:55:33 +02:00
artica	e4461273ab	Updated version and build strings.	2018-06-12 17:28:15 +02:00
fermin831	f1807246a1	Changed MR to 16 and current_package_enterprise to 723 for new and migrated installations	2018-05-30 15:49:59 +02:00
artica	01cce15955	Updated version and build strings.	2018-05-28 13:20:38 +02:00
fermin831	750ed29ac9	[Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable	2018-05-24 16:59:50 +02:00
fermin831	5e9cf38474	[Rebranding] Modified some strings to new installations	2018-05-23 18:21:42 +02:00
Fermin	8f2302630c	[Rebranding] Docs and Support login icons are configurables	2018-05-21 14:29:11 +02:00
artica	418d8b12b7	Updated version and build strings.	2018-04-19 16:05:39 +02:00
fermin831	9c82e3651a	Avoid cache tree view	2018-04-10 17:59:34 +02:00
artica	a67a4288a1	Updated version and build strings.	2018-04-10 10:18:25 +02:00
enriquecd	43e374f454	Fix id_os 100 cluster - #1748	2018-03-19 19:09:45 +01:00
artica	af5d70bd7d	Updated version and build strings.	2018-03-13 11:06:33 +01:00
artica	f3f0d7771c	Updated version and build strings.	2018-03-08 12:26:57 +01:00
danielmaya	610c5a5147	Updated MR and current_package_enterprise	2018-02-28 15:45:58 +01:00
enriquecd	ae471bb9f2	Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters	2018-02-07 13:52:44 +01:00
danielmaya	fb39c1e39b	Updated current_package_enterprise 719 and MR12	2018-02-06 10:27:07 +01:00
enriquecd	2b446a681d	Popup when click modules in cluster view, new images, filter modules - #1748	2018-01-30 17:38:29 +01:00
enriquecd	2b07a7a8a9	Change po,mo,mr and package - #1257	2018-01-25 15:49:21 +01:00
enriquecd	4358f37e07	Delete clusters, agents and modules - #1748	2018-01-24 16:15:53 +01:00
artica	cd2c000cbf	Updated version and build strings.	2018-01-24 14:27:02 +01:00
enriquecd	a149b3119e	Final Wizard without js, view list, cluster creation - #1748	2018-01-23 15:34:44 +01:00
enriquecd	5ab43d8106	Add menu section, new db tables and two new module types in pandoradb	2018-01-16 15:41:35 +01:00
artica	e895d06016	Updated version and build strings.	2017-12-18 13:26:41 +01:00
danielmaya	66547d28b0	Updated to MR 9	2017-11-15 11:15:12 +01:00
danielmaya	e6d5adbf22	Changed MR	2017-11-14 10:38:50 +01:00
artica	ef8b69841c	Updated version and build strings.	2017-11-08 15:30:28 +01:00
daniel	29c69b1dbc	add send mail plain/text	2017-11-07 11:43:46 +01:00
artica	906201a34c	Updated version and build strings.	2017-10-23 17:45:29 +02:00
vgilc	27746eedc0	Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'" ... This reverts merge request !862	2017-10-16 16:44:44 +02:00
vgilc	f8023bf44a	Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop' ... add send mail plain/text See merge request !862	2017-10-09 10:11:27 +02:00
Arturo Gonzalez	08ff3798c5	Changed mr token	2017-10-04 15:59:56 +02:00
artica	3188bf1b0b	Updated version and build strings.	2017-10-02 11:57:37 +02:00
daniel	9a66aa52f2	add send mail plain/text	2017-09-27 13:42:02 +02:00
artica	c4a709acf1	Updated version and build strings.	2017-09-06 17:22:32 +02:00
fbsanchez	629f5aa237	Merge branch 'develop' into 1256-cargarse-todo-rastro-de-ssh-gateway-y-vnc	2017-09-04 16:20:20 +02:00
fbsanchez	6995a81509	Removed all traces of anytermd from code	2017-09-04 16:19:56 +02:00
daniel	d74a3f74b4	Merge branch 'develop' into 1056-pandora-wux-grid-server	2017-09-01 10:51:54 +02:00
fbsanchez	2b18b1589c	Added new module type: web_analysis	2017-08-28 19:05:08 +02:00
Arturo Gonzalez	0e7b00f26e	Added correct user and fixed db error	2017-08-28 16:38:30 +02:00
daniel	c29d8a4fdb	Revert "merge develop" ... This reverts commit 8232911713, reversing changes made to f5da86ac0a.	2017-08-23 09:35:17 +02:00
artica	f7ea07d559	Updated version and build strings.	2017-08-16 13:09:03 +02:00
artica	8309e4fffb	Updated version and build strings.	2017-08-10 10:37:06 +02:00
artica	408efec325	Updated version and build strings.	2017-08-02 10:12:45 +02:00
Arturo Gonzalez	1ea465b7d4	Added db changes to package 708	2017-07-17 10:46:26 +02:00
artica	ede763cecf	Updated version and build strings.	2017-07-10 15:11:14 +02:00
Ramon Novoa	d2d56b4b89	Add a missing MR.	2017-06-15 13:47:20 +02:00
Ramon Novoa	7c3ef317b0	Revert "Add a missing MR." ... This reverts commit 16b0da1515.	2017-06-15 10:50:31 +02:00
Ramon Novoa	16b0da1515	Add a missing MR.	2017-06-15 10:33:30 +02:00
vgilc	c78711ba6f	Merge branch '539-encrypt-agent-custom-fields-in-pandora-console-dev' into 'develop' ... 539 encrypt agent custom fields in pandora console dev See merge request !520	2017-06-14 11:42:51 +02:00
artica	d3df682528	Updated version and build strings.	2017-06-12 16:05:06 +02:00
artica	3b481af7d6	Updated version and build strings.	2017-05-30 11:22:26 +02:00
Arturo Gonzalez	9e99bc4485	Added new field to pandoradb_data	2017-05-29 12:04:38 +02:00
Arturo Gonzalez	a4636f3435	Added changes in db	2017-05-29 11:55:04 +02:00
Daniel Maya	e243067c4b	New feature: Graphic grouping	2017-05-23 17:13:47 +02:00
artu30	37757f7ace	Merge branch 'develop' into '596-default_event_filter_by_user' ... # Conflicts: # pandora_console/godmode/users/configure_user.php	2017-05-23 09:48:37 +02:00
vgilc	d78058df44	Merge branch '703-MapQuest-Open-no-funciona' into 'develop' ... Change Map quest tile server url to free version - #703 See merge request !409	2017-05-17 17:13:33 +02:00
artica	24915e47cb	Updated version and build strings.	2017-05-17 12:08:40 +02:00
enriquecd	f91d59b236	Change Map quest tile server url to free version - #703	2017-04-25 16:33:28 +02:00
Arturo Gonzalez	97abef62c4	Added db field to mr	2017-04-18 11:39:46 +02:00
vgilc	991bca7f6c	Merge branch 'ent-402-plantilla-de-modulo-local-linux-zombie-processes-fallo' into 'develop' ... Modified Zombie processes local_component See merge request !267	2017-04-07 12:47:24 +02:00
Ramon Novoa	895ec34a4f	Remove the layer 2 recon script from the DB (not from the disk yet, for ... upgrades).	2017-03-23 16:15:57 +01:00
fermin831	d7dcd7f339	Modified Zombie processes local_component	2017-03-16 12:23:43 +01:00