6485 Commits

Author	SHA1	Message	Date
Daniel Barbero Martin	b62566af49	alert template schedule pandora_enterprise#3943	2022-02-01 16:50:53 +01:00
fbsanchez	5b06942caf	DANGER COMMIT, uses schema collation instead forced one	2022-02-01 15:18:45 +01:00
fbsanchez	592df1c3a7	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 ... Conflicts: pandora_console/pandoradb.sql	2022-02-01 15:16:21 +01:00
Daniel Rodriguez	91797c7112	Merge branch 'ent-8470-POST-ocultar-comando-en-respuestas-de-eventos-2' into 'develop' ... added token to display or hide command in event response execution See merge request artica/pandorafms!4671	2022-02-01 13:42:14 +00:00
alejandro.campos@artica.es	74c2dafed0	added token to display or hide command in event response execution	2022-02-01 14:30:25 +01:00
José González	36bef528ab	Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' ... # Conflicts: # pandora_console/godmode/massive/massive_delete_agents.php	2022-02-01 12:45:17 +00:00
Jose Gonzalez	40efaa157d	Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs	2022-02-01 13:42:30 +01:00
Jose Gonzalez	d81e6571ec	New audit logs	2022-02-01 13:39:18 +01:00
Daniel Barbero Martin	0a4d6cfd31	Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios ... Conflicts: pandora_console/include/styles/pandora.css	2022-02-01 11:36:33 +01:00
Daniel Barbero Martin	645257f9dc	alert template schedule pandora_enterprise#3943	2022-02-01 11:29:25 +01:00
Daniel Maya	f4c92c4854	#7430 Fixed url	2022-02-01 11:17:20 +01:00
Daniel Rodriguez	d21d65a7ac	Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop' ... Added select filtered modulo to custom graphs conf menu See merge request artica/pandorafms!4647	2022-02-01 09:38:12 +00:00
Calvo	34a9c2f1f2	Added token local user to allow enabling local auth at user level	2022-02-01 09:37:02 +01:00
Daniel Barbero Martin	15ada66942	alert template schedule pandora_enterprise#3943	2022-01-31 16:50:48 +01:00
Daniel Barbero Martin	c02abbc508	alert template schedule pandora_enterprise#3943	2022-01-31 13:45:44 +01:00
alejandro.campos@artica.es	b9c78bbfb1	show agent and module name tip	2022-01-31 13:18:26 +01:00
Daniel Barbero Martin	392a9223e8	alert template schedule pandora_enterprise#3943	2022-01-28 14:06:31 +01:00
Calvo	11dc743dac	Planned downtime copy.	2022-01-28 10:59:08 +01:00
Calvo	0b119af949	WIP:Planned downtime copy.	2022-01-27 18:24:14 +01:00
Calvo	a92fe64b64	WIP:Planned downtime copy.	2022-01-27 18:23:07 +01:00
alejandro.campos@artica.es	d210390a3d	truncate texts in module massive operations	2022-01-27 17:30:20 +01:00
Daniel Barbero Martin	a4f092f0a0	alert template schedule pandora_enterprise#3943	2022-01-27 17:02:24 +01:00
Daniel Maya	8a868c9fde	Fixed GIs map	2022-01-26 17:15:39 +01:00
Daniel Barbero Martin	89931ef564	alert template schedule #3943	2022-01-26 16:52:48 +01:00
Daniel Barbero Martin	d76745cc9f	chrome never autocomplete	2022-01-26 12:17:07 +01:00
Calvo	5b624fc388	Added searchbar to select multiple modules on custom graph	2022-01-26 11:52:49 +01:00
Daniel Barbero Martin	e6a4eb3059	alert template schedule	2022-01-26 10:30:38 +01:00
Daniel Barbero Martin	9f01029520	Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola	2022-01-26 08:12:20 +01:00
Daniel Barbero Martin	74f73e2004	Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios ... Conflicts: pandora_console/include/styles/pandora.css	2022-01-26 08:10:40 +01:00
Daniel Barbero Martin	1a6127624e	alert template schedule	2022-01-26 08:07:00 +01:00
Calvo	f383586dcc	WIP:Added searchbar to select multiple modules	2022-01-25 20:15:40 +01:00
Calvo	96d0194009	Merge remote-tracking branch 'origin/develop' into ent-8206-busqueda-de-modulos-en-graficas-personalizadas	2022-01-25 15:39:58 +01:00
fbsanchez	1207463f16	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 ... Conflicts: pandora_console/include/class/HTML.class.php	2022-01-25 14:16:47 +01:00
vgilc	4b85e93490	Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop' ... Ent 8222 nueva grafica desde la vista de modulos histograma See merge request artica/pandorafms!4637	2022-01-25 10:28:18 +00:00
Daniel Barbero Martin	2519335637	Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios ... Conflicts: pandora_console/include/styles/pandora.css	2022-01-25 10:40:37 +01:00
Daniel Barbero Martin	de77ee20c6	bulk operations agents in meta #8290	2022-01-25 10:28:14 +01:00
Daniel Barbero Martin	83970932ce	bulk operations agents in meta #8290	2022-01-24 16:57:42 +01:00
Daniel Barbero Martin	2fccdd12cb	bulk operations agents in meta #8290	2022-01-24 12:19:09 +01:00
Calvo	328a9db1fb	Added select filtered modulo to custom graphs conf menu	2022-01-21 12:56:14 +01:00
Daniel Barbero Martin	7c2000c34d	bulk operations agents in meta #8290	2022-01-21 11:49:30 +01:00
Daniel Barbero Martin	87bfd08bb9	bulk operations agents in meta #8290	2022-01-20 16:52:14 +01:00
Jose Gonzalez	3252832cc7	WIP: Check audit logs	2022-01-20 10:55:23 +01:00
fbsanchez	28743dcb5d	sizeof => count	2022-01-19 12:40:52 +01:00
fbsanchez	4193be829a	(php8 compat) Minor issue if phar failes to extract	2022-01-18 18:52:58 +01:00
Daniel Barbero Martin	4f46da6633	Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma ... Conflicts: pandora_console/include/styles/pandora.css	2022-01-18 10:17:19 +01:00
Jose Gonzalez	7a88e2db29	WIP: Testing Wordpress with prewebs	2022-01-17 17:15:37 +01:00
Jose Gonzalez	6fb7f317a6	Fix issues with links	2022-01-17 17:13:29 +01:00
Daniel Maya	e8d3d93f7f	Fixed pandora_black in metaconsole	2022-01-17 10:22:30 +01:00
fbsanchez	fee3f4ab96	php8 review + mdpf update	2022-01-12 14:22:16 +01:00
Daniel Rodriguez	4899d68ec2	Merge branch 'ent-8388-bug-en-eventos-generados-a-partir-alerta' into 'develop' ... fixed bugged selectors in action editor See merge request artica/pandorafms!4618	2022-01-11 10:10:59 +00:00