1463 Commits

Author	SHA1	Message	Date
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
marcos	1f89a0d293	fixed visual error	2021-03-29 09:58:23 +02:00
marcos	3934096d03	Merge remote-tracking branch 'origin/develop' into ent-7202-fallos-visuales-discovery	2021-03-29 09:21:04 +02:00
marcos	88f3ce9b90	fixed lost icons	2021-03-29 08:12:54 +02:00
marcos	89ba8b43fb	fixed visual error	2021-03-26 13:58:13 +01:00
Calvo	2c86e3e26c	Substituted eye with operation (magnifier) icon on credential store and tasklist	2021-03-26 12:20:37 +01:00
marcos	a6b9998bbe	fixed visual error	2021-03-25 13:42:21 +01: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
Daniel Rodriguez	9f22c061f5	Merge branch 'ent-5929-revision-general-logstash' into 'develop' ... Deleted logstash references Closes pandora_enterprise#5929 See merge request artica/pandorafms!3729	2021-03-24 11:57:47 +00: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
José González	6fbd40ea74	Merge branch 'develop' into 'ent-5929-revision-general-logstash' ... # Conflicts: # pandora_server/lib/PandoraFMS/Config.pm	2021-03-23 12:00:45 +00:00
Jose Gonzalez	d43c51cc66	WIP: Backup upload	2021-03-22 17:37:15 +01:00
Daniel Rodriguez	8f33c767b7	Merge branch 'ent-7132-bug-en-vista-agents-alerts' into 'develop' ... fixed visual error See merge request artica/pandorafms!3911	2021-03-22 12:46:58 +00: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
marcos	ebf912437b	fixed error with sort function	2021-03-18 18:05:53 +01:00
Daniel Rodriguez	3eaff54b73	Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop' ... Ent 6232 nt incluir metricas en el wizard de interfaces snmp See merge request artica/pandorafms!3935	2021-03-18 16:02:56 +00:00
marcos	b55ebd69f0	fixed visual error	2021-03-18 11:30:53 +01:00
marcos	b6a7598c33	fixed visual error	2021-03-18 09:53:39 +01:00
Daniel Rodriguez	b6b399e635	Merge branch 'ent-7170-color-de-icono-de-alertas-en-tree-view-black-theme' into 'develop' ... fixed visual error See merge request artica/pandorafms!3926	2021-03-17 16:29:41 +00:00
Daniel Rodriguez	372d367b8e	Merge branch 'ent-6760-interfaces-con-guion-nombre-no-generan-correctamente' into 'develop' ... Fixed interfaces wizard modules genartion wit hypen See merge request artica/pandorafms!3694	2021-03-17 16:29:07 +00:00
Luis	e667bdd2e8	Fixed interfaces wizard modules genartion wit hypen	2021-03-17 16:29:07 +00:00
marcos	1ea562fe17	fixed visual error	2021-03-17 13:22:11 +01:00
marcos	e689813e2c	fixed icons	2021-03-16 13:37:13 +01:00
marcos	4c5f220264	fixed visual error	2021-03-15 17:55:54 +01:00
fbsanchez	c20c206a5f	Fixed task edit url when nof fully defined (custom-script)	2021-03-15 14:37:08 +01:00
Daniel Barbero Martin	b78f4093ac	fixed error tree groups agent edition metaconsole	2021-03-15 13:31:24 +01:00
Jose Gonzalez	5b1517f767	Merge	2021-03-12 11:07:44 +01:00
Marcos Alconada	d8a628b1c4	Ent 6781 revision de estilos visuales y eliminacion de sistemas skins	2021-03-11 14:40:23 +00:00
Daniel Maya	c7b33c9c9c	Ent 7119 11478 ticket guardia snmp browser falla a la hora de visualizar datos	2021-03-11 11:18:13 +00: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
Jose Gonzalez	cf1c460a9d	Fixed all issues	2021-03-11 09:12:53 +01:00
Jose Gonzalez	92d654763f	Fixed some issues	2021-03-10 16:20:45 +01:00
José González	b7bd28ba07	Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' ... # Conflicts: # pandora_console/extras/delete_files/delete_files.txt	2021-03-10 10:17:27 +00:00
Daniel Rodriguez	39e735ed22	Merge branch 'ent-5760-problema-sistema-de-notificaciones-en-servidores-con-pocos-modulos' into 'develop' ... Avoid performance tests if there are not enough modules in system See merge request artica/pandorafms!3765	2021-03-09 16:31:38 +00:00
José González	69e1f1fb33	Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' ... # Conflicts: # pandora_console/extras/delete_files/delete_files.txt # pandora_console/include/styles/pandora.css	2021-03-09 14:39:15 +00:00
Daniel Rodriguez	bf2705f571	Merge branch 'ent-6528-fallo-acl-servicios' into 'develop' ... Fixed services ACL on services treeview See merge request artica/pandorafms!3685	2021-03-04 10:46:31 +00:00
fbsanchez	c5b2b90476	Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus ... Conflicts: pandora_console/extras/mr/45.sql	2021-03-02 09:48:33 +01:00
fbsanchez	d96590aea5	Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision ... Conflicts: pandora_console/include/functions_ui.php pandora_console/include/styles/pandora.css	2021-03-02 09:40:15 +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	0fb3ba9232	System status notifications filtered by subtype	2021-02-19 13:36:29 +01:00