649 Commits

Author	SHA1	Message	Date
Daniel Rodriguez	7673e40613	Merge branch 'ent-7737-Pandora-recien-instalado-mensaje-de-advertencia-de-fuente-por-defecto-no-definida' into 'develop' ... fixed font reference See merge request artica/pandorafms!4238	2021-08-11 07:12:13 +00:00
Daniel Rodriguez	ac23d187a1	Merge branch 'ent-7589-black-theme-y-edicion-de-usuario' into 'develop' ... fixed visual error See merge request artica/pandorafms!4212	2021-08-10 12:23:42 +00:00
alejandro.campos@artica.es	7fa398b027	fixed font reference	2021-06-28 11:25:22 +02:00
fbsanchez	4c2ac234b8	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center ... Conflicts: pandora_console/extras/mr/48.sql pandora_console/godmode/servers/plugin.php	2021-06-24 14:37:30 +02:00
Luis	497ecb329d	Changed new wiki url on helps	2021-06-24 12:31:15 +00:00
Daniel Barbero Martin	c6877154fb	Wip command center, Plugins in meta	2021-06-16 17:26:19 +02:00
marcos	493047ae40	fixed visual error	2021-06-16 14:17:45 +02:00
Daniel Barbero Martin	64dd4f2c2b	Wip command center, Plugins in meta	2021-06-15 17:24:03 +02:00
fbsanchez	94cd4c96dd	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center ... Conflicts: pandora_console/extras/delete_files/delete_files.txt pandora_console/include/javascript/pandora_ui.js	2021-06-14 17:37:01 +02:00
Daniel Rodriguez	08011d60b2	Merge branch 'ent-7122-nuevo-update-manager' into 'develop' ... Embebed UMC in Pandora FMS See merge request artica/pandorafms!3894	2021-06-14 11:56:43 +00:00
fbsanchez	cdad04f9cd	Update the DB schema when upgrading from RPMs. ... Call updateMR.php to update the database schema when manually upgrading from RPM packages.	2021-06-14 11:56:42 +00:00
Daniel Barbero Martin	a7c1c49636	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-06-14 08:42:31 +02:00
Daniel Rodriguez	0adcf5aac2	Merge branch 'ent-7671-cambiar-enlaces-a-documentacion' into 'develop' ... add new link documentation See merge request artica/pandorafms!4188	2021-06-11 08:32:06 +00:00
fbsanchez	ae34209f52	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-06-10 21:45:50 +02:00
Marcos Alconada	665efa4fb7	Ent 7519 cambio de fuentes en la consola a nivel global	2021-06-10 08:19:11 +00:00
Daniel Rodriguez	4b819360ff	Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" ... This reverts merge request !4132	2021-06-09 18:09:43 +02:00
marcos	50282dccf4	add new link documentation	2021-06-09 16:55:25 +02:00
Marcos Alconada	2334eccd01	Ent 7519 cambio de fuentes en la consola a nivel global	2021-06-09 13:59:28 +00:00
Daniel Barbero Martin	3a947d31bd	Wip command center, collections merge	2021-06-07 17:58:36 +02:00
Daniel Maya	e6713c2f2c	#6917 metaconsole config changes	2021-05-25 09:58:18 +00:00
Alejandro Campos	caaa9c407e	Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' ... # Conflicts: # pandora_console/extras/mr/47.sql # pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php	2021-05-13 11:39:24 +00:00
Daniel Rodriguez	6faefa4afa	Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' ... Unified downtime name as scheduled downtime See merge request artica/pandorafms!4001	2021-05-10 09:06:43 +00:00
Luis	f25256a74d	Unified downtime name as scheduled downtime	2021-05-10 09:06:43 +00:00
alejandro.campos@artica.es	fdeaf52912	implemented user level authentication for integria ims integration	2021-05-07 14:29:29 +02:00
Luis	bec8085ca5	Added path check to config attachment store	2021-04-27 10:34:08 +00:00
alejandro.campos@artica.es	3ff361977c	check page load protocol on integria setup	2021-04-16 10:02:34 +02:00
Daniel Maya	9bbac06771	Ent 7161 cambiar opciones de skin en usuarios y grupos	2021-04-13 09:26:50 +00:00
fbsanchez	fdc4133eaa	Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision	2021-03-25 10:20:02 +01:00
Daniel Maya	79914082e9	Ent 6850 quitar nta	2021-03-24 15:16:13 +00:00
fbsanchez	0179e89740	Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision	2021-03-24 13:16:54 +01:00
fbsanchez	c3232b0f2a	Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos ... Conflicts: pandora_console/include/class/ConsoleSupervisor.php	2021-03-24 09:55:31 +01:00
fbsanchez	e0aa1bfc68	Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision ... Conflicts: pandora_console/extras/delete_files/delete_files.txt pandora_console/include/styles/pandora.css	2021-03-22 09:59:07 +01:00
Daniel Rodriguez	128fabfde2	Merge branch 'ent-6648-Añadir-agentes-a-politicas-metaconsola' into 'develop' ... Ent 6648 añadir agentes a politicas metaconsola See merge request artica/pandorafms!3912	2021-03-16 16:41:13 +00:00
alejandro.campos@artica.es	8dc6ec4e07	added setup token	2021-03-16 09:21:16 +01:00
alejandro.campos@artica.es	3c5bf3eeef	Merge remote-tracking branch 'origin/develop' into temp	2021-03-12 12:34:47 +01:00
fbsanchez	95f1a2abcc	Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision ... Conflicts: pandora_console/extras/delete_files/delete_files.txt	2021-03-11 10:00:17 +01:00
Daniel Rodriguez	988b6826fc	Merge branch 'ent-7065-Modificar-scripts-generacion-y-publicacion-de-paquetes' into 'develop' ... cambio de dominio See merge request artica/pandorafms!3888	2021-03-10 16:01:39 +00:00
Daniel Rodriguez	d992b818b2	Merge branch 'ent-6568-setup-module-library-no-se-puede-borrar-usuario' into 'develop' ... Module library user pass let empty user/pass See merge request artica/pandorafms!3706	2021-03-09 16:34:22 +00:00
Daniel Barbero Martin	219ca1914d	cambio de dominio	2021-03-09 16:02:05 +01:00
Alejandro Campos	d4054f15d0	Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' ... # Conflicts: # pandora_console/extras/mr/45.sql # pandora_console/godmode/alerts/configure_alert_action.php # pandora_server/util/pandora_db.pl	2021-03-04 10:27:07 +00:00
alejandro.campos@artica.es	901d12fec0	Integration with Integria	2021-02-25 13:18:04 +01:00
fbsanchez	4b0f96126b	minor fix	2021-02-22 12:25:24 +01:00
fbsanchez	85f37a91de	Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision ... Conflicts: pandora_console/include/functions_ui.php	2021-02-22 12:01:29 +01:00
fbsanchez	0be3e0ab90	Event widget and some notices fixed	2021-02-10 15:00:23 +01:00
Daniel Rodriguez	df603853ad	Merge branch 'ent-7020-movidas-del-wizard' into 'develop' ... Ent 7020 movidas del wizard See merge request artica/pandorafms!3816	2021-02-09 16:25:06 +01:00
Marcos Alconada	92cf6c60cb	Ent 7015 establecer las nuevas consolas visuales habilitadas por defecto en instalaciones nuevas	2021-02-05 15:08:58 +01:00
fbsanchez	5a38d31a6d	Wizard (interfaces) backend performance improved	2021-02-04 13:11:47 +01:00
fbsanchez	712079c30e	RC1 #4755	2021-02-01 15:00:54 +01:00
fbsanchez	dbc48852aa	Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision ... Conflicts: pandora_console/extras/delete_files/delete_files.txt	2021-01-28 16:12:47 +01:00
fbsanchez	9fc3856f83	WIP historical database automaintenance + minor fixes	2021-01-28 13:20:36 +01:00
fbsanchez	c7706a6bfa	WIP Historical database manager (setup)	2021-01-27 12:35:37 +01:00
Daniel Rodriguez	40921b96f9	Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop' ... Avoid erase ALL sessions from tsessions_php (pandora_db) See merge request artica/pandorafms!3663	2021-01-05 13:43:42 +01:00
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
daniel	76da033775	fix legend pdf chart verticals	2020-12-17 16:58:20 +01:00
José González	623b729001	Merge branch 'develop' into 'ent-1175-copyright-actualizados' ... # Conflicts: # pandora_agents/pc/Win32/pandora_agent.conf # pandora_agents/win32/bin/pandora_agent.conf # pandora_console/extensions/realtime_graphs.php # pandora_console/godmode/snmpconsole/snmp_alert.php # pandora_console/include/functions_ui.php # pandora_console/install.php # pandora_console/operation/agentes/realtime_win.php	2020-12-14 11:10:35 +01:00
Luis Calvo	d0b119c05f	Module library user pass let empty user/pass	2020-12-10 10:49:13 +01:00
Daniel Maya	3a0f14e7bd	Ent 5835 9693 error al exportar csv el log view parte 2	2020-12-02 10:13:22 +01:00
Jose Gonzalez	649442f794	Updated copyrights	2020-11-27 13:52:35 +01:00
fbsanchez	7e61465955	Avoid erase ALL sessions from tsessions_php (pandora_db)	2020-11-26 18:27:11 +01:00
marcos	13d90bb1c5	Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario	2020-11-18 12:05:57 +01:00
daniel	3455de7f85	fixed visual errors and default values	2020-10-07 16:03:52 +02:00
marcos	848f60229a	updates on 2FA all users feature	2020-10-06 17:02:58 +02:00
daniel	1b5ccfb20a	Add new token chart fit to content	2020-10-05 17:03:30 +02:00
fbsanchez	b07d24ed25	Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos ... Conflicts: pandora_console/include/functions_api.php pandora_console/operation/events/events.php	2020-09-30 18:38:27 +02:00
marcos	f8666adf0f	F2 feature	2020-09-30 14:20:57 +02:00
Marcos Alconada	85a41af644	Ent 5296 anadir boton guardar contrasena en active directory	2020-09-18 14:50:50 +02:00
fbsanchez	867fccf604	Custom id improvements	2020-09-17 14:38:01 +02:00
Daniel Maya	cbc8630dfc	Ent 5206 9287 exportacion a csv con dato con muchos decimales y miles trae confusion	2020-07-23 16:52:24 +02:00
alejandro-campos	63df6c15f0	Merge branch 'develop' into ent-6030-Problema-codificacion	2020-07-01 16:39:00 +02:00
Alejandro Campos	a81e4acbb7	Merge branch 'develop' into 'ent-6030-Problema-de-codificacion' ... # Conflicts: # pandora_console/include/functions_config.php	2020-06-23 09:28:21 +02:00
alejandro-campos	6520ad2107	Added setup token	2020-06-23 09:21:15 +02:00
alejandro-campos	1243968872	Merge branch 'develop' into ent-5935-Logs-de-la-consola-refactorizacion	2020-06-19 12:12:52 +02:00
Alejandro Fraguas	f8c9448866	Merge branch 'ent-5955-XSS-System-logfiles' into 'develop' ... Solved security issue with system logfiles field Closes pandora_enterprise#5955 See merge request artica/pandorafms!3289	2020-06-15 10:24:48 +02:00
Alejandro Fraguas	51f61059f4	Merge branch 'ent-5953-XSS-Visual-styles' into 'develop' ... Cleaned tags for affected fields Closes pandora_enterprise#5953 See merge request artica/pandorafms!3285	2020-06-15 09:47:19 +02:00
Jose Gonzalez	251e6669b9	Solved security issue with system logfiles field	2020-06-09 12:51:17 +02:00
Jose Gonzalez	73cf98fc02	Cleaned tags for affected fields	2020-06-09 10:22:54 +02:00
alejandro-campos	ab61cf1fc5	changed console and audit log locations	2020-06-08 10:48:48 +02:00
fbsanchez	fae026a089	Form fixes	2020-05-26 13:48:43 +02:00
Tatiana Llorente	ec57540fb0	Ent 5432 libreria de modulos de pandora integrada en consola	2020-02-27 11:20:24 +01:00
marcos	76ed257287	Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens	2020-01-21 15:23:26 +01:00
alejandro-campos	bb4d3abe6b	change config default value	2020-01-17 12:42:29 +01:00
Marcos Alconada	5268c23c7a	Merge branch 'develop' into 'ent-4705-encriptado-de-nuevos-tokens' ... # Conflicts: # pandora_console/include/functions_config.php	2020-01-16 09:23:42 +01:00
alejandro-campos	d9062def99	Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024	2020-01-15 16:01:11 +01:00
alejandro-campos	3f26f2ef6f	fix bug when deleting custom units and changed default value for byte multiplier	2020-01-15 16:00:33 +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
vgilc	c14a462e63	Merge branch '5027-pandora-db-error-history-db-step' into 'develop' ... Added control for int values See merge request artica/pandorafms!2927	2020-01-07 10:20:26 +01:00
Tatiana Llorente	4cd1ca38a4	Ent 5091 unificacion de tamaño de letra en informes	2020-01-07 09:25:31 +01:00
marcos	b551f1a13c	update	2019-12-18 17:48:29 +01:00
marcos	f3ddec4436	updates	2019-12-18 15:30:23 +01:00
marcos	91fe85e90e	updates2	2019-12-18 15:15:25 +01:00
marcos	35136ada8e	minnor error	2019-12-17 15:25:28 +01:00
Tatiana Llorente	eca876212c	Ent 5095 visualizacion formato de fechas	2019-12-17 12:15:51 +01:00
alejandro-campos	d30c2c9b3b	Fix bug when updating ACL IP list	2019-12-13 14:17:25 +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
Jose Gonzalez	6883240931	Added control for int values	2019-12-02 11:54:39 +01:00
Daniel Barbero Martin	ea2c5bc8c9	Fixed translate	2019-11-27 11:49:20 +01:00
daniel	960326b980	Add menu omnishell	2019-11-21 18:21:46 +01:00
fbsanchez	83590146b1	Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms	2019-11-13 17:38:24 +01:00
Daniel Rodriguez	073ca73b2a	Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop' ... Added token in visual styles to change the font size in items of reports - #4670 See merge request artica/pandorafms!2798	2019-11-12 18:09:39 +01:00
fbsanchez	72b1fb2b16	Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF ... Conflicts: pandora_console/include/javascript/pandora.js modified: pandora_console/general/register.php modified: pandora_console/godmode/agentes/configurar_agente.php modified: pandora_console/godmode/agentes/module_manager_editor.php new file: pandora_console/include/ajax/welcome_window.php new file: pandora_console/include/class/WelcomeWindow.class.php modified: pandora_console/include/constants.php modified: pandora_console/include/functions_config.php modified: pandora_console/include/javascript/pandora.js new file: pandora_console/include/styles/new_installation_welcome_window.css	2019-10-30 16:56:44 +01:00
marcos	e725a0185b	cambios semi finales	2019-10-24 16:56:13 +02:00
fbsanchez	709f4cac81	WebSocket configuration, quickShell settings, quickShell proxied url compatibility	2019-10-23 19:56:48 +02:00
fbsanchez	6c52462c8c	Modular WebSocket engine, added ssh and telnet to quickshell extension	2019-10-21 17:36:26 +02:00
Tatiana Llorente	18679f90e5	Added token in visual styles to change the font size in items of reports - #4670	2019-10-09 16:24:37 +02:00
Daniel Rodriguez	c9cfbf0bf2	Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop' ... Ent 4461 configuracion integracion integria See merge request artica/pandorafms!2732	2019-09-26 14:34:50 +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
Tatiana Llorente	5436df5575	Changed the word incident for ticket - #4461	2019-09-25 16:13:37 +02:00
Tatiana Llorente	84ae4a8391	Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria ... Conflicts: pandora_console/extras/mr/32.sql	2019-09-25 10:50:31 +02:00
Daniel Rodriguez	e03e83d565	Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop' ... fixed error percentil label See merge request artica/pandorafms!2734	2019-09-25 10:27:13 +02:00
fbsanchez	746f817fe4	Windows: Revisión general Pandora - Discovery	2019-09-24 19:07:55 +02:00
Daniel Barbero Martin	84d1979c9e	fixed error percentil label	2019-09-18 11:15:55 +02:00
alejandro-campos	87f8badc18	completed integria setup and incident creation and update	2019-09-17 13:38:17 +02:00
alejandro-campos	93b9c76f58	Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email	2019-09-10 10:50:53 +02:00
alejandro-campos	11cb53582c	backup changes	2019-09-02 17:01:41 +02:00
alejandro-campos	28cf43498e	lint change	2019-08-05 14:18:23 +02:00
alejandro-campos	9b8e3c540c	created integria integration setup	2019-08-05 13:42:01 +02:00
fbsanchez	c386a29b80	Merge remote-tracking branch 'origin/develop' into ent-3105-comportamiento-public_url	2019-07-12 09:38:28 +02:00
Daniel Barbero Martin	bd070b706b	fixed minor error	2019-07-11 12:45:52 +02:00
Alejandro Fraguas	26c606b0d5	Merge branch 'ent-3090-Personalizacion-saml-2' into 'develop' ... Added more parameters to SAML configuration See merge request artica/pandorafms!2506	2019-07-09 13:18:12 +02:00
fbsanchez	eb01e9baaf	public_url with force option	2019-07-02 14:17:53 +02:00
fbsanchez	a6327a16ad	Session expiration ignoring notifications checks	2019-07-01 12:46:09 +02:00
alejandro-campos	3d75e045f9	added new fields to saml configuration and added check to not allow user creation with all group in case an empty value was specified in group name attribute input	2019-06-27 17:42:29 +02:00
alejandro-campos	2a69e3a75e	Merge remote-tracking branch 'origin/develop' into ent-3090-Personalizacion-saml-2	2019-06-26 18:06:23 +02:00
alejandro-campos	f74b32fe3c	Added more parameters to SAML configuration	2019-06-14 10:34:51 +02:00
alejandro-campos	52b1c5e39b	fix bug: path of ssl certificate not being set on general settings	2019-06-13 13:18:17 +02:00
Daniel Rodriguez	81ac4e5bef	Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop' ... Ent 3466 ad advanced perms fixed See merge request artica/pandorafms!2194	2019-06-10 16:05:21 +02:00
alejandro-campos	89ff40e2b9	moved mail server setup to general setup	2019-06-10 09:43:27 +02:00
Alejandro Fraguas	45c58a7c72	Merge branch 'ent-4041-7980-bug-parametro-event_storm_protection' into 'develop' ... Variability event_storm_protection check is added with empty data See merge request artica/pandorafms!2428	2019-06-03 11:58:52 +02:00
Daniel Maya	552467286c	Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' ... # Conflicts: # pandora_console/extras/mr/28.sql	2019-05-29 11:10:31 +02:00
Alejandro Gallardo Escobar	f5d5cbf5b8	VC item cache improvements. ... -Added a default value to the configuration. -Changed the control to edit the cache expiration. - Added the cache to more items.	2019-05-28 18:34:07 +02:00
Luis Calvo	5966367f8f	eHorus user level login conf added in user editor	2019-05-28 13:14:42 +02:00
Luis Calvo	588d19102f	Resolve merge conflict	2019-05-27 18:30:24 +02:00
fbsanchez	7b5ae40868	multiple fixes	2019-05-23 10:27:50 +02:00
marcos.alconada	86dabc6476	Variability event_storm_protection check is added with empty data	2019-05-17 11:31:02 +02:00
Luis Calvo	c527435a0e	eHorus user-login settings ... Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb	2019-05-10 15:32:25 +02:00
marcos.alconada	b51cdb93df	arreglo con la vista del formulario ... Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9	2019-05-10 15:00:21 +02:00
marcos.alconada	793304b52d	Se habilita el boton de ehorus ... Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9	2019-05-10 12:26:09 +02:00
Luis Calvo	ecce1160e1	Added button to select ehorus conf type and box into user conf	2019-05-09 19:23:18 +02:00
marcos.alconada	e0729b6ca6	Se vuelve a crear la rama ... Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6	2019-05-09 14:59:47 +02:00
Alejandro Gallardo Escobar	2d9b4908de	Visual Console Refactor: the legacy visual console is enabled by default ... Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a	2019-04-25 14:08:55 +02:00
Alejandro Gallardo Escobar	998a66f654	Visual Console Refactor: added a setting to use the legacy VC and added the relation line width setup option to the client ... Former-commit-id: c6bb6ed82a8e84c485ad7270ebb46150fdfcfa8b	2019-04-16 12:23:03 +02:00
manuel	db13ecbb39	Added token save profile user ... Former-commit-id: 442a51cfbe7ac9730e9fd9c2c1ee16b6609e5f6a	2019-04-08 11:55:58 +02:00
daniel	89bbbd2893	Revert "fixed IPAM config" ... This reverts commit 1fe1beb930 [formerly 39b80d2ca41c21a823cdec5948e30109a81eeb2a] Former-commit-id: e11aec8e300db083b7ce04cb74d19de276e69eb7	2019-04-02 14:06:05 +02:00
Alejandro Fraguas	2461f826ce	Merge branch 'ent-3715-Pete_sql_en_mr_del_ipam' into 'develop' ... fixed IPAM config See merge request artica/pandorafms!2274 Former-commit-id: 95786e5f3fa31e8d8c663ee8f3488336c59d9b3c	2019-04-02 09:41:02 +02:00
fermin831	a2f5b8502a	Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/include/styles/pandora.css Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78	2019-03-26 10:11:13 +01:00
Tatiana Llorente	fe7103ba9c	Changes in header ... Former-commit-id: 3c69b91277f0078a65764c297126d3ebb0dfc11c	2019-03-25 12:41:39 +01:00
fermin831	2711eb59ea	Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql pandora_console/pandoradb.sql Former-commit-id: 29c3e96f3022c59a9252849c2adeb29182476395	2019-03-25 09:20:06 +01:00
Daniel Barbero Martin	1fe1beb930	fixed IPAM config ... Former-commit-id: 39b80d2ca41c21a823cdec5948e30109a81eeb2a	2019-03-20 09:51:15 +01:00
fermin831	b660da6e84	Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1 ... Conflicts: pandora_console/extras/mr/26.sql pandora_console/install.php Former-commit-id: dda11929acf5f741e0a4d290b4607ae72683284b	2019-03-14 10:49:16 +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