Commit Graph

5615 Commits

Author SHA1 Message Date
Luis 4ab7b1a135 Ent 6952 bug group creation user admin no all 2021-04-07 08:11:35 +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 aaded121a4 Merge branch 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas' into 'develop'
restricted action creation on alerts created from policy

See merge request artica/pandorafms!3891
2021-04-06 17:46:47 +00:00
Daniel Rodriguez 43cfa383ac Merge branch 'ent-5370-Pestaña-de-comandos-de-alertas-sin-paginacion' into 'develop'
Add pagination to commands view

See merge request artica/pandorafms!3919
2021-04-06 17:44:54 +00:00
Daniel Rodriguez 8ebaddc233 Merge branch 'ent-6941-Problemas-de-rendimiento-en-la-vista-Manage-users' into 'develop'
Ent 6941 problemas de rendimiento en la vista manage users

See merge request artica/pandorafms!3799
2021-04-06 17:33:38 +00:00
Daniel Rodriguez bec22b5825 Merge branch 'ent-7238-salto-de-linea-perfil-grupo-manage-users' into 'develop'
Fixed user/profile newline on users_list

See merge request artica/pandorafms!3982
2021-04-06 17:24:20 +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 1e90b0d300 Merge branch 'ent-6986-11304-ordenar-alfabeticamente-los-resultados-snmp-en-discovery' into 'develop'
Modules alphabetically sorted in Discovery review

See merge request artica/pandorafms!3907
2021-04-06 17:09:28 +00:00
Daniel Rodriguez 1eba5f8e6c Merge branch 'ent-7072-mensaje-erroneo-module-management-meta' into 'develop'
Fixed centralized management warnin on module management meta

See merge request artica/pandorafms!3880
2021-04-06 17:06:40 +00:00
Luis 4944820aed Fixed centralized management warnin on module management meta 2021-04-06 17:06:40 +00:00
Daniel Rodriguez 7756056755 Merge branch 'ent-7242-cambio-iconos-vista-edicion-agentes' into 'develop'
restored bell and module icon with plus on agent edition view

See merge request artica/pandorafms!3988
2021-04-06 17:03:19 +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
Luis 4b9f8ce202 Added custom fields combo larger params 2021-04-06 16:51:14 +00:00
fbsanchez 98b7a9c66a Update DiscoveryTaskList.class.php 2021-04-05 14:05:53 +00:00
Calvo 8352e4d18d restored bell and module icon with plus on agent edition view 2021-03-31 10:54:58 +02:00
Calvo 847fc44b14 Fixed user/profile newline on users_list 2021-03-30 13:34:38 +02:00
Daniel Rodriguez 3770f491dc Merge branch 'ent-7231-icono-vistas-consolas-visuales' into 'develop'
fixed icon

See merge request artica/pandorafms!3975
2021-03-29 12:39:02 +00:00
marcos e26c2eb76d fixed icon 2021-03-29 14:30:00 +02:00
marcos 390d7e79cd fixed buttton position 2021-03-29 12:32:14 +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
Daniel Rodriguez 812007169d Merge branch 'ent-7209-boton-new-ayer-en-creacion-edicion-gis-maps-no-funciona' into 'develop'
fixed visual error

See merge request artica/pandorafms!3969
2021-03-26 13:52:44 +00:00
Marcos Alconada 9dd17acb57 fixed visual error 2021-03-26 13:40:55 +00:00
marcos 56462b1b06 fixed visual error 2021-03-26 14:32:29 +01:00
Daniel Rodriguez 48b299ba67 Merge branch 'ent-7228-Errores-en-las-Visual-consoles-de-Metaconsola' into 'develop'
fixed minor error

See merge request artica/pandorafms!3967
2021-03-26 13:05:28 +00:00
Daniel Rodriguez dff3ef3484 Merge branch 'ent-7223-error-message-update-manager-offline' into 'develop'
Restored not update error message on update manager offline

See merge request artica/pandorafms!3965
2021-03-26 12:35:57 +00:00
Daniel Barbero Martin 487a9b96d9 fixed minor error 2021-03-26 13:25:42 +01:00
Calvo 887742a675 Restored not update error message on update manager offline 2021-03-26 13:02:55 +01:00
Calvo 2c86e3e26c Substituted eye with operation (magnifier) icon on credential store and tasklist 2021-03-26 12:20:37 +01:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop'
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
2021-03-25 14:33:31 +00:00
Daniel Rodriguez 29e7e3c844 Merge branch 'ent-7196-tabla-de-list-sla-no-se-muestra' into 'develop'
fixed visual error

See merge request artica/pandorafms!3946
2021-03-25 11:55:33 +00:00
marcos 823bf52372 fixed visual error 2021-03-25 11:49:32 +01: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
marcos 90c825888a fixed visual error 2021-03-23 15:12:57 +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 da4c5a1c28 Merge branch 'ent-7167-meta-varios-botones-y-ventanas-descuadradas' into 'develop'
fixed visual errors

See merge request artica/pandorafms!3925
2021-03-18 17:05:50 +00:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
Daniel Rodriguez 8eb06d8adc Merge branch 'ent-6753-consistencia-en-el-selector-de-grupos' into 'develop'
group selector updates for report, required

See merge request artica/pandorafms!3763
2021-03-18 16:05:16 +00:00
Daniel Maya 6a9dff3355 Ent 6852 integrar edicion de sistema de credencial boxes con edicion de coniguracion del satelite en la misma vista 2021-03-18 16:00:14 +00:00
Daniel Rodriguez 9c4a6a56c7 Merge branch 'ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle' into 'develop'
add discovery_app_microsoft_sql_serve on task list

See merge request artica/pandorafms!3058
2021-03-18 09:56:31 +00:00
fbsanchez a3069fdf76 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 2021-03-18 10:04:18 +01:00
fbsanchez 61cb8a43c6 Merge remote-tracking branch 'origin/develop' into ent-6894-uniway-estado-pending-en-server-task-aws
Conflicts:
	pandora_console/godmode/wizards/DiscoveryTaskList.class.php
2021-03-17 13:25:38 +01:00
fbsanchez 71a0dcfd0c Merge remote-tracking branch 'origin/develop' into ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle
Conflicts:
	pandora_console/include/constants.php
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2021-03-17 10:11:58 +01:00
Daniel Rodriguez 2c05a1fe72 Merge branch 'ent-7164-iconos-cambiados-en-varias-vistas' into 'develop'
fixed icons

See merge request artica/pandorafms!3923
2021-03-16 17:01:35 +00:00
Daniel Rodriguez aa1e5022a2 Merge branch 'ent-7126-recuperar-selector-de-temas-en-setup-visual' into 'develop'
revert selector theme

See merge request artica/pandorafms!3915
2021-03-16 16:49:43 +00:00
Daniel Rodriguez 4bf47eaa35 Merge branch 'ent-7145-boton-de-borrado-de-items-desplazado-en-lista-de-informes' into 'develop'
fixed position

See merge request artica/pandorafms!3909
2021-03-16 16:47:54 +00:00
Daniel Rodriguez 9e2d774d8f Merge branch 'ent-7148-estilos-rotos-en-varios-botones-de-custom-graphs-de-informes' into 'develop'
fixed visual style error

See merge request artica/pandorafms!3905
2021-03-16 16:47:26 +00:00
Daniel Rodriguez 7d4f6de646 Merge branch 'ent-7162-Botones-descolocados-en-remote-components' into 'develop'
fixed errors visual

See merge request artica/pandorafms!3920
2021-03-16 16:45:30 +00:00