1452 Commits

Author	SHA1	Message	Date
Marcos Alconada	3bc2844b4d	fixed visual error black theme	2021-06-04 11:03:35 +00:00
Daniel Barbero Martin	12e67380ee	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-05-28 14:37:20 +02:00
Calvo	8010b375dd	trace deleted	2021-05-28 14:10:12 +02:00
Daniel Rodriguez	2eb85562c2	Merge branch 'ent-7468-campo-plugin-falla-bandwith-politicas' into 'develop' ... Fixed issue with id_plugin with bandwidth modules Closes pandora_enterprise#7468 See merge request artica/pandorafms!4159	2021-05-28 10:38:21 +00:00
Daniel Barbero Martin	8c7654cd2d	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center ... Conflicts: pandora_console/godmode/setup/os.php pandora_console/include/styles/pandora.css pandora_console/operation/users/user_edit.php	2021-05-28 08:26:19 +02:00
José González	91e870edbc	Fixed issue with id_plugin with bandwidth modules	2021-05-27 22:06:58 +02:00
Daniel Rodriguez	be77599c07	Merge branch 'ent-7337-tree-view-os-no-aparecen-not-init-modules' into 'develop' ... Fixed not showing agents with not init modules on os treeview See merge request artica/pandorafms!4120	2021-05-27 16:22:47 +00:00
Luis	cb6f130ab0	Fixed not showing agents with not init modules on os treeview	2021-05-27 16:22:47 +00:00
Daniel Rodriguez	3f8d3a883f	Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop' ... Ent 7002 revision cabeceras tabs Closes pandora_enterprise#7002 See merge request artica/pandorafms!4094	2021-05-27 16:21:48 +00:00
Daniel Rodriguez	c2314717e3	Merge branch 'ent-7467-wizard-snmp-falla-para-modulos-que-usen-braa' into 'develop' ... Ent 7467 wizard snmp falla para modulos que usen braa See merge request artica/pandorafms!4139	2021-05-27 16:19:08 +00:00
Daniel Barbero Martin	a1ca4abe8f	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-05-27 08:22:43 +02:00
fbsanchez	50242d3030	OID fixes while retrieving from remote Satellite server	2021-05-26 17:55:30 +02:00
Daniel Rodriguez	e3cd5b6d56	Merge branch 'ent-7468-snmp-wizard-modulos-plugin-no-configuran-campo-plugin' into 'develop' ... Fixed missed parameter Closes pandora_enterprise#7468 See merge request artica/pandorafms!4097	2021-05-26 13:38:43 +00:00
Daniel Rodriguez	693e3988b9	Merge branch 'ent-7182-barra-de-busqueda-no-funciona-correctamente' into 'develop' ... Changed search bar text See merge request artica/pandorafms!4004	2021-05-26 13:36:47 +00:00
Daniel Barbero Martin	d91e7f6aba	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-05-26 08:28:42 +02:00
Daniel Rodriguez	b875199f28	Merge branch 'ent-7492-bug-visual-vista-agents-alerts-no-alerts' into 'develop' ... Ent 7492 bug visual vista agents alerts no alerts See merge request artica/pandorafms!4110	2021-05-25 15:53:41 +00:00
Luis	eb54ce9a62	Ent 7492 bug visual vista agents alerts no alerts	2021-05-25 15:53:41 +00:00
José González	76628117fa	Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' ... # Conflicts: # pandora_console/operation/messages/message_edit.php	2021-05-25 13:50:17 +00:00
Daniel Barbero Martin	73454dd4ea	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-05-20 08:21:31 +02:00
Daniel Rodriguez	4ea790a649	Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop' ... Ent 7141 vulnerabilities csrf Closes pandora_enterprise#7141 See merge request artica/pandorafms!4015	2021-05-19 16:00:16 +00:00
Daniel Barbero Martin	6c305833bf	fix groups, module_groups, network_components user_edit synch	2021-05-18 17:18:54 +02:00
José González	e5ebc52356	Fixed missed parameter	2021-05-18 13:32:10 +02:00
fbsanchez	0d50ea94db	Ensure oid starts with dot - braa requriements	2021-05-18 13:27:06 +02: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
alejandro.campos@artica.es	9cde8c345f	removed deprecated incident permissions	2021-05-13 13:33:45 +02:00
Daniel Rodriguez	13fa1159ce	Merge branch 'ent-6858-Goliat-opensource' into 'develop' ... Backup upload See merge request artica/pandorafms!3936	2021-05-12 13:10:48 +00:00
José González	9e9ea4d00a	Merge with last develop	2021-05-12 09:17:32 +02:00
Daniel Rodriguez	858adb2628	Merge branch 'ent-7345-Bugs-en-el-apartado-de-Diagnosticos' into 'develop' ... Fixed errors diagnostic See merge request artica/pandorafms!4047	2021-05-11 13:48:55 +00:00
Daniel Rodriguez	5efb331568	Merge branch 'ent-7140-vista-agents-alerts-salta-vista-principal' into 'develop' ... Fixed agents/alerts view group change when public url foreced See merge request artica/pandorafms!4108	2021-05-06 12:17:38 +00:00
Daniel Rodriguez	0371a9acd6	Merge branch 'ent-7218-filtrado-erroneo-tree-view' into 'develop' ... Fixed treeview filter by module status See merge request artica/pandorafms!3981	2021-05-06 12:14:16 +00:00
Daniel Rodriguez	db92b65fd0	Merge branch 'ent-7211-errores-visuales-en-la-vista-de-agente' into 'develop' ... resolved error with sql message error external tools2 See merge request artica/pandorafms!3979	2021-05-06 12:05:04 +00:00
Calvo	dec202ed78	Fixed agents/alerts view group change when public url foreced	2021-05-05 17:53:52 +02:00
José González	f8f6016c21	Solved issues with double quotes and improve the code	2021-05-04 19:07:18 +02:00
José González	e49edc93d6	Fixed missed parameter	2021-05-04 13:48:13 +02:00
José González	9ab027b286	WIP: Upload	2021-04-29 13:28:03 +02:00
Daniel Rodriguez	4589e77bc8	Merge branch 'ent-7370-modal-incorrecto-al-editar-el-nodo-de-un-cluster' into 'develop' ... fixed error with modal cluster view See merge request artica/pandorafms!4057	2021-04-27 10:39:23 +00:00
José González	e957961ee5	Fixed issue with id_plugin	2021-04-22 14:15:56 +02:00
marcos	733087f704	fixed error with modal cluster view	2021-04-22 13:23:49 +02:00
Daniel Barbero Martin	998ad91b69	Fixed errors diagnostic	2021-04-21 11:07:20 +02:00
Jose Gonzalez	9f92a4b6c5	Added CSRF token input for PrintForms	2021-04-09 13:31:11 +02: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
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 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	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
fbsanchez	5143bbdfdb	networkmaps in dashboards MC	2021-04-06 16:47:32 +02:00
Daniel Rodriguez	8a62fa67ad	Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop' ... Ent 7171 iconos poco visibles en monitor detail black theme See merge request artica/pandorafms!3929	2021-03-30 09:51:04 +00:00
marcos	063bbb4433	resolved conflict merge	2021-03-30 11:31:29 +02:00
Calvo	245286330c	Fixed treeview filter by module status	2021-03-30 08:28:10 +02:00
marcos	5d38740630	resolved error with sql message error external tools2	2021-03-29 16:54:41 +02:00