15166 Commits

Author	SHA1	Message	Date
Daniel Rodriguez	1b9916c6e9	Merge branch 'ent-6818-bug-en-label-de-informes-y-plantillas' into 'develop' ... fixed error with label reporting views See merge request artica/pandorafms!3938	2021-04-09 09:24:44 +00:00
Jose Gonzalez	f8d4039314	Fixed merges	2021-04-09 10:34:25 +02:00
Daniel Barbero Martin	a80b6664d4	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-04-09 08:04:03 +02:00
artica	70c6e7196f	Auto-updated build strings.	2021-04-09 01:00:40 +02:00
Daniel Barbero Martin	2a6dffd0f8	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-04-08 17:32:32 +02:00
artica	2e27cebad2	Auto-updated build strings.	2021-04-08 01:00:37 +02:00
fbsanchez	cf6ad584d4	Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil	2021-04-07 17:46:43 +02:00
Daniel Rodriguez	b62dc5c0c2	Merge branch 'ent-6982-Bug-al-crear-Agent-event-report-a-traves-de-wizard' into 'develop' ... fixed visual error report wizard See merge request artica/pandorafms!3896	2021-04-07 15:10:32 +00:00
daniel	d78c276721	fixed visual error report wizard	2021-04-07 15:10:32 +00:00
Daniel Rodriguez	1f61161e6f	Merge branch 'ent-6997-bug-unidades-item-general-summation' into 'develop' ... General report exponent prefix shows with blankspace See merge request artica/pandorafms!3924	2021-04-07 13:15:38 +00:00
marcos	4395f21e4e	add black theme style on visual map	2021-04-07 13:27:24 +02:00
Daniel Rodriguez	517d7378d4	Merge branch 'ent-7079-escapar-caracters-url-api' into 'develop' ... Addded param to escape API url call raw_decode See merge request artica/pandorafms!3914	2021-04-07 10:54:47 +00:00
Daniel Rodriguez	9813586f0d	Merge branch 'ent-6935-OPEN-mouse-over-confuso-items' into 'develop' ... Added more clear message Closes pandora_enterprise#6935 See merge request artica/pandorafms!3853	2021-04-07 10:54:20 +00:00
Daniel Rodriguez	ed6fa1a803	Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop' ... dashboards meta See merge request artica/pandorafms!3840	2021-04-07 10:53:31 +00:00
Daniel Rodriguez	b244cd28b2	Merge branch 'ent-6962-tags-largos-no-caben-en-configuracion-modulos' into 'develop' ... Added tips to large tags in module config See merge request artica/pandorafms!3851	2021-04-07 10:52:39 +00:00
Luis	36287188b4	Added tips to large tags in module config	2021-04-07 10:52:39 +00:00
Daniel Rodriguez	f0870e6e08	Merge branch 'ent-7028-giss-implementar-dropdown-buscador-para-custom-fields' into 'develop' ... select2 on select items See merge request artica/pandorafms!3836	2021-04-07 10:52:07 +00:00
Daniel Barbero Martin	fcf449439b	WIP command center	2021-04-07 12:43:04 +02:00
fbsanchez	6e4212129b	Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil ... Conflicts: pandora_console/include/styles/dashboards.css pandora_console/mobile/operation/visualmap.php pandora_console/mobile/operation/visualmaps.php	2021-04-07 10:28:44 +02:00
Daniel Barbero Martin	216410946e	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-04-07 10:20:46 +02:00
fbsanchez	4920dc9621	Revert "Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop'" ... This reverts merge request !3860	2021-04-07 10:17:32 +02:00
Calvo	420960ed9e	Changed search bar text	2021-04-07 10:14:27 +02:00
Luis	4ab7b1a135	Ent 6952 bug group creation user admin no all	2021-04-07 08:11:35 +00:00
Daniel Barbero Martin	e5b2a27631	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center ... Conflicts: pandora_console/extras/mr/46.sql	2021-04-07 08:26:38 +02:00
artica	8734494b7f	Auto-updated build strings.	2021-04-07 01:00:38 +02:00
Daniel Rodriguez	7593fe9f81	Merge branch 'ent-4536-Quitar-el-autocompletado-de-los-campos-personalizados' into 'develop' ... Ent 4536 quitar el autocompletado de los campos personalizados See merge request artica/pandorafms!3811	2021-04-06 17:48:14 +00:00
Daniel Rodriguez	0fc3cb8714	Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop' ... Multicolumn setup for performance and visual settings See merge request artica/pandorafms!3921	2021-04-06 17:47:39 +00:00
Daniel Rodriguez	58d5c2bc69	Merge branch 'ent-7066-bug-filtro-alert-detail' into 'develop' ... Fixed alert detail filter and tactical view counter for disabled alers/agents/modules See merge request artica/pandorafms!3881	2021-04-06 17:30:27 +00:00
Daniel Rodriguez	32527863cb	Merge branch 'ent-7095-Bug-en-Tree-group-metaconsola-con-usuario-no-ALL' into 'develop' ... fixed error tree groups agent edition metaconsole See merge request artica/pandorafms!3904	2021-04-06 17:23:18 +00:00
Daniel Rodriguez	8b817c63c7	Merge branch 'ent-6994-cambiar-el-orden-de-los-items-de-un-template-en-iformes-no-funciona' into 'develop' ... unsort template items See merge request artica/pandorafms!3810	2021-04-06 17:22:33 +00:00
Daniel Rodriguez	3ae93da065	Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop' ... Ent 4475 validar alertas api cli See merge request artica/pandorafms!3820	2021-04-06 17:21:56 +00:00
Luis	6dac9039d4	Ent 4475 validar alertas api cli	2021-04-06 17:21:56 +00:00
Daniel Rodriguez	68a8c37545	Merge branch 'ent-6808-llamada-api-deja-logueado-usuario' into 'develop' ... Fixed session close on api See merge request artica/pandorafms!3749	2021-04-06 17:18:53 +00:00
Daniel Rodriguez	7a0139accd	Merge branch 'ent-5544-9725-llamada-api-para-ver-el-numero-de-licencias-agentes-disponibles' into 'develop' ... API get license, get license_remaining See merge request artica/pandorafms!3814	2021-04-06 17:18:24 +00:00
Daniel Rodriguez	a70a74fb47	Merge branch 'ent-7241-ventana-de-newsletter-con-errores-visuales' into 'develop' ... fixed lost icon See merge request artica/pandorafms!3984	2021-04-06 17:15:41 +00:00
Marcos Alconada	f2efb6a39b	fixed lost icon	2021-04-06 17:15:41 +00:00
Daniel Rodriguez	e54e06b6ac	Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop' ... fixed errors sound events See merge request artica/pandorafms!3916	2021-04-06 17:11:37 +00:00
daniel	89ffb05466	fixed errors sound events	2021-04-06 17:11:37 +00:00
Daniel Rodriguez	1de0f6060c	Merge branch 'ent-4228-system-uptime-always-shows-data-formatted-as-date' into 'develop' ... Fixed data always formatting to date in sys uptime snmp modules See merge request artica/pandorafms!3857	2021-04-06 17:08:40 +00:00
Daniel Rodriguez	29bf07d96c	Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' ... Fixed issue with URLs Closes pandora_enterprise#7040 See merge request artica/pandorafms!3860	2021-04-06 17:05:17 +00:00
Daniel Rodriguez	c192a1681b	Merge branch 'ent-7022-open-error-en-la-ruta-de-netscan-custom' into 'develop' ... Fixed task edit url when nof fully defined (custom-script) See merge request artica/pandorafms!3906	2021-04-06 17:00:49 +00:00
Daniel Rodriguez	859c174c1b	Merge branch 'ent-7093-Item-group-event-report-chequea-tabla-incorrecta' into 'develop' ... fixed error events reports See merge request artica/pandorafms!3902	2021-04-06 16:59:42 +00:00
Daniel Rodriguez	1b32ad83ff	Merge branch 'ent-7052-entities-en-nombre-de-eventos' into 'develop' ... remove entities when add comment See merge request artica/pandorafms!3839	2021-04-06 16:58:05 +00:00
Marcos Alconada	654a4ebbd0	remove entities when add comment	2021-04-06 16:58:05 +00:00
Daniel Rodriguez	6adc987f72	Merge branch 'ent-7035-enlace-modulos-rotos-module-library' into 'develop' ... Fixed module library download links See merge request artica/pandorafms!3834	2021-04-06 16:56:37 +00:00
Luis	4b9f8ce202	Added custom fields combo larger params	2021-04-06 16:51:14 +00:00
Daniel Barbero Martin	0e30f1bc4f	WIP command center	2021-04-06 17:22:34 +02:00
fbsanchez	5143bbdfdb	networkmaps in dashboards MC	2021-04-06 16:47:32 +02:00
Jose Gonzalez	2a7aa8c1e5	Fix bugs with SLA item reports	2021-04-06 15:25:43 +02:00
fbsanchez	1c94f619ef	Custom graphs in widget in MC	2021-04-06 14:20:07 +02:00