Commit Graph

1536 Commits

Author SHA1 Message Date
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
Junichi Satoh 5fcf3eca23 Fixed problems in planned downtime below.
- modules cannot be added to defined planned downtime with 'Quiet' mode.
- pending modules for delete can be selected when modify defined planned downtime.
2021-06-08 14:43:43 +09:00
Daniel Barbero Martin 835aad542f Wip command center, agent synch 2021-06-07 12:19:03 +02:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
fbsanchez 70b8eb77a3 Remove service elements when removing items itselves and multiple fixes 2021-06-01 12:12:07 +02:00
Daniel Rodriguez 844f583b0c Merge branch 'ent-7596-ocultar-campos-http-auth-en-modulos-web' into 'develop'
Ocultar campos http auth en modulos web en campo Web Checks

See merge request artica/pandorafms!4162
2021-05-31 11:25:25 +00:00
Calvo b253a01841 Ocultar campos http auth en modulos web en campo Web Checks 2021-05-28 14:00:43 +02:00
Jose Gonzalez 84902a5d3d Fixed code 2021-05-28 13:20:16 +02: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
Luis 8c100e8809 Resize vertical on textarea web/data server modules css 2021-05-26 13:39:25 +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 Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop'
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
2021-05-17 14:41:11 +00:00
José González 998fb4b0dc Fixed issue with undesired deactivate dynamic threshold max field 2021-05-14 11:22:32 +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
José González 9e9ea4d00a Merge with last develop 2021-05-12 09:17:32 +02:00
Daniel Rodriguez 5a339ac76e Merge branch 'ent-7284-Warning-creación-agente' into 'develop'
Ent 7284 warning creación agente

See merge request artica/pandorafms!4017
2021-05-10 09:10:43 +00:00
Daniel Maya cdf0e1a4f4 Ent 7284 warning creación agente 2021-05-10 09:10:43 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02: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
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
Marcos Alconada b00e7eff8b fixed size with select2 in module component 2021-04-28 10:48:32 +00:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
Jose Gonzalez 0e12402469 Fixed message issue 2021-04-15 21:20:59 +02:00
Jose Gonzalez 3d3beca727 Added feature of generate event 2021-04-15 15:06:48 +02:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02: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 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
Luis 4b9f8ce202 Added custom fields combo larger params 2021-04-06 16:51:14 +00:00
Calvo 8352e4d18d restored bell and module icon with plus on agent edition view 2021-03-31 10:54:58 +02:00
marcos 5d38740630 resolved error with sql message error external tools2 2021-03-29 16:54:41 +02:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Jose Gonzalez 4ee0c580bb WIP: Backup upload 2021-03-22 17:52:11 +01:00
Jose Gonzalez 4b7c0fc7ee WIP: Backup upload 2021-03-22 17:39:24 +01:00
Jose Gonzalez d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01:00
Daniel Rodriguez e59600c10b Merge branch 'ent-7151-errores-visuales-en-manage-agents-modo-details' into 'develop'
Ent 7151 errores visuales en manage agents modo details

See merge request artica/pandorafms!3922
2021-03-16 16:44:40 +00:00
marcos f05592faeb fixed error 2021-03-16 13:12:03 +01:00
marcos 137a2c31ad fixed visual fails 2021-03-15 15:30:56 +01:00
Daniel Maya e4e3007def Fixed img 2021-03-15 13:32:25 +01:00
Daniel Rodriguez 971f86601a Merge branch 'ent-5276-AADCM-creacion-de-paradas-planificadas' into 'develop'
Refactored downtime editor

See merge request artica/pandorafms!3879
2021-03-15 11:29:04 +00:00
alejandro.campos@artica.es 88b4b4920f Merge remote-tracking branch 'origin/develop' into ent-5276-AADCM-creacion-de-paradas-planificadas 2021-03-15 12:13:05 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
alejandro.campos@artica.es 2f7a826253 minor fixes 2021-03-11 17:54:20 +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 Rodriguez 05a133bf77 Merge branch 'ent-4659-AADCM-Opcion-de-deshabilitar-mediante-checks-varios-modulos-desde-la-vista-de-agente' into 'develop'
added option to disable selected agents massively

See merge request artica/pandorafms!3874
2021-03-10 15:55:07 +00:00