tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,738 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

21126 Commits

Author SHA1 Message Date
fbsanchez ddb58f56e9 errata fix 2021-03-18 11:48:52 +01:00
marcos b55ebd69f0 fixed visual error 2021-03-18 11:30:53 +01:00
marcos 82d435c295 fixed visual error 2021-03-18 11:05:40 +01:00
Daniel Rodriguez c2f297c26a Merge branch 'ent-6574-mensaje-borrado-agentes-meta' into 'develop' 
Fixed api agent delete and show correct message when called by meta wizard

See merge request artica/pandorafms!3892
 2021-03-18 10:01:22 +00:00
Luis 085b5ece87 Fixed api agent delete and show correct message when called by meta wizard 2021-03-18 10:01:21 +00:00
Daniel Rodriguez cb1da6d7ba Merge branch 'ent-7062-vulneravilidad-xx-en-mensajes' into 'develop' 
fixed xss vulnerability

See merge request artica/pandorafms!3861
 2021-03-18 10:00:35 +00:00
Marcos Alconada 9040e832b8 fixed xss vulnerability 2021-03-18 10:00:34 +00:00
Daniel Rodriguez de175ec755 Merge branch 'ent-7081-snmp-wizard-con-muchas-interfaces-da-error-de-php' into 'develop' 
POST/GET reloaded if empty in ajax

See merge request artica/pandorafms!3867
 2021-03-18 09:59:55 +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
marcos bac8b98ad2 fixed visual error 2021-03-18 10:48:44 +01:00
fbsanchez 38695482c0 Validate custom text 2021-03-18 10:35:41 +01:00
marcos 13575a457c fixed visual error 2021-03-18 10:35:19 +01: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
marcos a0607e7230 fixed visual error 2021-03-18 10:03:52 +01:00
marcos b6a7598c33 fixed visual error 2021-03-18 09:53:39 +01:00
artica 572f8c9908 Auto-updated build strings. 2021-03-18 01:00:22 +01:00
Daniel Rodriguez 1729e158ca Merge branch 'ent-7152-iconos-de-flecha-descolacos-en-edit-my-user' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3928
 2021-03-17 16:31:34 +00: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 e8e9b61d32 fixed visual error 2021-03-17 16:44:57 +01:00
marcos 667ccd50ce fixed visual error 2021-03-17 16:44:10 +01:00
Daniel Rodriguez 0c99745c37 Merge branch 'ent-6894-uniway-estado-pending-en-server-task-aws' into 'develop' 
Task list status

See merge request artica/pandorafms!3759
 2021-03-17 15:41:14 +00:00
Daniel Rodriguez 3eb6a8b3c4 Merge branch 'ent-7125-bug-visual-en-group-view' into 'develop' 
fixed visual error group view

See merge request artica/pandorafms!3897
 2021-03-17 15:22:01 +00:00
marcos 0195a80b78 fixed visual error 2021-03-17 14:41:36 +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
marcos 1ea562fe17 fixed visual error 2021-03-17 13:22:11 +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
artica 610d41290e Auto-updated build strings. 2021-03-17 01:00:20 +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 6745fb7c7a Merge branch 'ent-7150-Bug-en-edicion-de-dashboard' into 'develop' 
fixed visual error dashboards

See merge request artica/pandorafms!3908
 2021-03-16 16:46:38 +00:00
Daniel Rodriguez d933fd224d Merge branch 'ent-7154-estilos-rotos-en-attached-fies-en-la-vista-de-integria' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3910
 2021-03-16 16:46:14 +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
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
Daniel Rodriguez 24f9ce7acf Merge branch 'ent-7160-SNMP-Browser-no-saca-las-opciones-de-v3' into 'develop' 
fixed errors visual snmp browser

See merge request artica/pandorafms!3918
 2021-03-16 16:42:51 +00:00
Daniel Rodriguez 989e6441d8 Merge branch 'ent-6868-massive-operations-snmp-modules' into 'develop' 
Fixed snmpv3 options on modules massive op

See merge request artica/pandorafms!3739
 2021-03-16 16:41:54 +00:00
Luis 6bb6f1121b Fixed snmpv3 options on modules massive op 2021-03-16 16:41:54 +00:00
Daniel Rodriguez 128fabfde2 Merge branch 'ent-6648-Añadir-agentes-a-politicas-metaconsola' into 'develop' 
Ent 6648 añadir agentes a politicas metaconsola

See merge request artica/pandorafms!3912
 2021-03-16 16:41:13 +00:00
marcos df8695b015 fix green old theme 2021-03-16 16:25:09 +01:00
marcos e689813e2c fixed icons 2021-03-16 13:37:13 +01:00
marcos f05592faeb fixed error 2021-03-16 13:12:03 +01:00
Daniel Rodriguez f880e0632d Merge branch 'ent-7137-error-en-merge-reporting-builder-y-policy-agents' into 'develop' 
resolved merge conflict

See merge request artica/pandorafms!3900
 2021-03-16 11:52:55 +00:00
Daniel Barbero Martin fd1c885e2f fixed errors visual 2021-03-16 12:06:59 +01:00
Daniel Barbero Martin e4a6c8c876 fixed errors visual snmp browser 2021-03-16 11:44:44 +01:00
marcos f765493ce7 revert selector theme 2021-03-16 11:24:05 +01:00
Daniel Rodriguez eea114e3d1 Merge branch 'ent-7119-Ticket-GUARDIA-SNMPBrowser-falla-a-la-hora-de-visualizar-datos-2' into 'develop' 
Ent 7119 ticket guardia snmp browser falla a la hora de visualizar datos 2

See merge request artica/pandorafms!3903
 2021-03-16 09:13:44 +00:00
alejandro.campos@artica.es 75d57c41ac remove constant 2021-03-16 09:22:43 +01:00
alejandro.campos@artica.es 8dc6ec4e07 added setup token 2021-03-16 09:21:16 +01:00
artica df269f52c1 Auto-updated build strings. 2021-03-16 01:00:18 +01:00
marcos 4c5f220264 fixed visual error 2021-03-15 17:55:54 +01:00
marcos 03cb6ef913 fixed visual error 2021-03-15 17:05:34 +01:00
marcos bd4cad3c83 fixed position 2021-03-15 16:28:30 +01:00
Daniel Barbero Martin 2b8b27a863 fixed visual error dashboards 2021-03-15 15:42:22 +01:00
marcos 137a2c31ad fixed visual fails 2021-03-15 15:30:56 +01:00
marcos 95787e2fe8 fixed visual style error 2021-03-15 14:38:20 +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
marcos 09e94bd0e9 resolved merge conflict 2021-03-15 11:43:36 +01:00
fbsanchez 1762e758fa forced no display_errors 2021-03-15 10:09:02 +01:00
fbsanchez b63f1ad681 Removed extra verbosity 2021-03-15 10:07:36 +01:00
artica fc29160c91 Auto-updated build strings. 2021-03-15 01:00:15 +01:00
artica 0f848d48e8 Auto-updated build strings. 2021-03-14 01:00:14 +01:00
artica 5fca622b3b Auto-updated build strings. 2021-03-13 01:00:19 +01:00
Daniel Rodriguez 5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' 
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
 2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es b4927d6071 minor fix 2021-03-12 12:46:27 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
marcos ac3587208b fixed visual error 2021-03-12 12:10:56 +01:00
Daniel Rodriguez 7723ef6e23 Merge branch 'ent-6846-Network-tools-al-setup-general' into 'develop' 
Ent 6846 network tools al setup general

Closes pandora_enterprise#6846

See merge request artica/pandorafms!3735
 2021-03-12 11:01:05 +00:00
marcos de716ddc4a fixed visual error group view 2021-03-12 11:55:54 +01:00
Daniel Rodriguez 54ae1db8de Merge branch 'ent-6781-revision-de-estilos-visuales-y-eliminacion-de-sistemas-skins-errores' into 'develop' 
fixed error with snmpbrower modal

See merge request artica/pandorafms!3895
 2021-03-12 10:12:46 +00:00
Jose Gonzalez 6a427cfa8a Fixed 2021-03-12 11:09:34 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00
Daniel Rodriguez 41ef1d41ff Merge branch 'ent-7031-Problemas-2FA' into 'develop' 
Fixed forced 2FA

Closes pandora_enterprise#7031

See merge request artica/pandorafms!3855
 2021-03-12 09:13:59 +00:00
marcos 7f46d078c0 fixed error with snmpbrower modal 2021-03-12 09:32:07 +01:00
artica d4bf4b9cad Auto-updated build strings. 2021-03-12 01:00:20 +01:00
alejandro.campos@artica.es 2f7a826253 minor fixes 2021-03-11 17:54:20 +01:00
fbsanchez b48af30d96 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/create_container.php
	pandora_console/godmode/reporting/graph_builder.main.php
	pandora_console/godmode/reporting/reporting_builder.main.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/include/javascript/pandora_ui.js
	pandora_console/views/dashboard/formDashboard.php
 2021-03-11 17:47:27 +01:00
Daniel Rodriguez 16ee65ba95 Merge branch 'ent-6781-revision-de-estilos-visuales-y-eliminacion-de-sistemas-skins' into 'develop' 
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins

See merge request artica/pandorafms!3699
 2021-03-11 14:40:24 +00: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 1f64b598c8 Merge branch 'ent-7098-Solucion-para-mostar-datos-de-estado-warning' into 'develop' 
new report histogram

See merge request artica/pandorafms!3875
 2021-03-11 14:22:28 +00:00
daniel 54fc2e89d3 new report histogram 2021-03-11 14:22:28 +00:00
Jose Gonzalez ba997dd13f Fixed 2021-03-11 14:49:39 +01:00
fbsanchez 6df9870f92 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/include/functions_api.php
	visual_console_client/src/Item.ts
 2021-03-11 14:37:06 +01:00
Jose Gonzalez e7d509cc74 Merge remote-tracking branch 'origin' into ent-7031-Problemas-2FA 2021-03-11 13:18:30 +01: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
artica 74fb084ba5 Auto-updated build strings. 2021-03-11 01:00:18 +01:00
Daniel Rodriguez 988b6826fc Merge branch 'ent-7065-Modificar-scripts-generacion-y-publicacion-de-paquetes' into 'develop' 
cambio de dominio

See merge request artica/pandorafms!3888
 2021-03-10 16:01:39 +00:00
Daniel Rodriguez 2422813a29 Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop' 
visual fixes in agent view graphs

See merge request artica/pandorafms!3884
 2021-03-10 15:56:15 +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
Daniel Rodriguez 38cc8d2ab9 Merge branch 'ent-5284-Granular-los-permisos-de-alerta' into 'develop' 
permissions limitation for command management

See merge request artica/pandorafms!3872
 2021-03-10 15:54:31 +00:00
Daniel Rodriguez 3db990ba36 Merge branch 'ent-6559-Cambio-en-el-target-ip-al-crear-módulos-desde-el-browser-snmp' into 'develop' 
Ent 6559 cambio en el target ip al crear módulos desde el browser snmp

See merge request artica/pandorafms!3751
 2021-03-10 15:53:55 +00:00
Daniel Rodriguez 96d5555ed2 Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop' 
Ent 6464 discovery id recon server no cambia si no existe

Closes pandora_enterprise#6464

See merge request artica/pandorafms!3788
 2021-03-10 15:53:28 +00:00
Jose Gonzalez 92d654763f Fixed some issues 2021-03-10 16:20:45 +01:00
alejandro.campos@artica.es 5c3b5d2be0 minor fixes in scheduled downtime setup 2021-03-10 13:02:17 +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
alejandro.campos@artica.es 71e9452988 Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora 2021-03-10 10:28:45 +01:00
alejandro.campos@artica.es 5913313bae Increased number of possible custom fields for Integria action 2021-03-10 10:28:27 +01:00
artica e34a1c47c8 Auto-updated build strings. 2021-03-10 01:01:06 +01:00
Daniel Rodriguez c8bc516b5d Merge branch 'ent-6830-item-Servicios-Consolas-Visuales' into 'develop' 
Fixed VC service title %

See merge request artica/pandorafms!3854
 2021-03-09 16:39:56 +00:00
daniel b434e05376 Fixed VC service title % 2021-03-09 16:39:55 +00:00
Daniel Rodriguez 06a027127f Merge branch 'ent-6851-Quitar-marquesina-de-vista-de-eventos' into 'develop' 
Ent 6851 quitar marquesina de vista de eventos

See merge request artica/pandorafms!3752
 2021-03-09 16:39:26 +00:00
Daniel Maya b54845fdcf Ent 6851 quitar marquesina de vista de eventos 2021-03-09 16:39:26 +00:00
Daniel Rodriguez 1846cb6471 Merge branch 'ent-6888-uniway-deshabilitar-boton-crear-una-vez-pulsado-para-evitar-duplicados' into 'develop' 
avoid double networkmap creation

See merge request artica/pandorafms!3762
 2021-03-09 16:38:51 +00:00
Daniel Rodriguez 825c1f05f0 Merge branch 'ent-6527-mal-link-elementos-servicio' into 'develop' 
Added control for id_agent_module

Closes pandora_enterprise#6527

See merge request artica/pandorafms!3703
 2021-03-09 16:38:32 +00:00
Daniel Rodriguez 4996be48dc Merge branch 'ent-6966-No-se-ve-fecha-validacion' into 'develop' 
Fixed issue with date

Closes pandora_enterprise#6966

See merge request artica/pandorafms!3818
 2021-03-09 16:37:34 +00:00
Daniel Rodriguez 011507f065 Merge branch 'ent-6832-Item-historico-de-eventos-Consolas-Visuales' into 'develop' 
Fixed VC events history

See merge request artica/pandorafms!3850
 2021-03-09 16:36:37 +00:00
daniel 0c5cfcc90e Fixed VC events history 2021-03-09 16:36:37 +00:00
Daniel Rodriguez d992b818b2 Merge branch 'ent-6568-setup-module-library-no-se-puede-borrar-usuario' into 'develop' 
Module library user pass let empty user/pass

See merge request artica/pandorafms!3706
 2021-03-09 16:34:22 +00:00
Daniel Rodriguez 868694ba24 Merge branch 'ent-6968-Ordenar-servicios-por-descripcion-tree-view' into 'develop' 
Fixed sorting by description

Closes pandora_enterprise#6968

See merge request artica/pandorafms!3825
 2021-03-09 16:33:12 +00:00
Daniel Rodriguez 950b7bcdfd Merge branch 'ent-5140-Añadir-summary-al-availability-graph' into 'develop' 
add summary report availability graph

See merge request artica/pandorafms!3709
 2021-03-09 16:32:12 +00:00
daniel 6e0188fac1 add summary report availability graph 2021-03-09 16:32:12 +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
Daniel Barbero Martin 219ca1914d cambio de dominio 2021-03-09 16:02:05 +01: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
Jose Gonzalez f1dd050333 Solve deleted files 2021-03-09 15:19:28 +01:00
Jose Gonzalez f0dd360786 Fixed merge 2021-03-09 12:56:59 +01:00
fbsanchez b384e97da5 Test REGEXP is valid before apply in MySQL 2021-03-09 10:17:29 +01:00
artica f9d5767027 Auto-updated build strings. 2021-03-09 01:00:17 +01:00
alejandro.campos@artica.es 0a8c478c47 visual fixes in agent view graphs 2021-03-08 17:48:59 +01:00
Jose Gonzalez 34b7c1003b Fixed error with sorting 2021-03-08 11:20:50 +01:00
Jose Gonzalez c235cfb01a Fixed 2021-03-08 08:21:45 +01:00
artica 2bd9515152 Auto-updated build strings. 2021-03-08 01:00:14 +01:00
artica 438c388423 Auto-updated build strings. 2021-03-07 01:00:17 +01:00
artica 80c568bbdd Auto-updated build strings. 2021-03-06 01:00:19 +01:00
Luis Calvo f445ddc9ea Fixed refresh auto hide on visual c 2021-03-05 14:11:08 +01:00
Daniel Rodriguez b9f72a1ef9 Merge branch 'ent-6892-Discover-Task-List-no-hay-limitación-por-grupo' into 'develop' 
Ent 6892 discover task list no hay limitación por grupo

See merge request artica/pandorafms!3756
 2021-03-05 12:56:01 +00:00
Daniel Rodriguez 84da313641 Merge branch 'ent-6910-11185-no-cambio-parametros-llamada-api-get_module_graph' into 'develop' 
Added with option for api_get_module_graph

See merge request artica/pandorafms!3770
 2021-03-05 12:53:24 +00:00
Daniel Rodriguez ea7c7c88b2 Merge branch 'ent-7025-operaciones-masivas-error' into 'develop' 
Ent 7025 operaciones masivas error

Closes pandora_enterprise#7025

See merge request artica/pandorafms!3833
 2021-03-05 12:49:13 +00:00
Jose Gonzalez 0860b6e647 Fix ordenation with subservices 2021-03-05 13:07:53 +01:00
Jose Gonzalez df30df4637 Merge remote-tracking branch 'origin' into ent-6968-Ordenar-servicios-por-descripcion-tree-view 2021-03-05 12:37:29 +01:00
fbsanchez cfded31e1b minor fix 2021-03-05 11:18:47 +01:00
fbsanchez bcde9f940e b64 2021-03-05 11:17:50 +01:00
fbsanchez ae3d54cedf B64 included in user options 2021-03-05 11:11:19 +01:00
fbsanchez 1534fd9c40 API module graph width 2021-03-05 10:30:14 +01:00
artica eb912405a6 Auto-updated build strings. 2021-03-05 01:00:53 +01:00
alejandro.campos@artica.es b117bbfd7e Refactored downtime editor 2021-03-04 16:27:14 +01:00
fbsanchez daa95d40c8 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-04 14:32:01 +01:00
Daniel Maya aace7344a1 Fixed issue with id_grupo 2021-03-04 12:41:14 +01:00
Daniel Maya 1bbbbcaee1 Ent 6890 condición agentes vista sap 2021-03-04 10:57:52 +00:00
Daniel Rodriguez 6c2a353812 Merge branch 'ent-6839-Crear-llamadas-a-la-api-para-activar-o-parar-una-discovery-task' into 'develop' 
Ent 6839 crear llamadas a la api para activar o parar una discovery task

See merge request artica/pandorafms!3798
 2021-03-04 10:47:20 +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
Daniel Rodriguez 8281d98f83 Merge branch 'ent-6926-Vista-de-servidores-no-muestra-masters' into 'develop' 
Ent 6926 vista de servidores no muestra masters

See merge request artica/pandorafms!3809
 2021-03-04 10:45:05 +00:00
Daniel Rodriguez d6b7b46139 Merge branch 'ent-6925-vista-previa-en-acciones-de-alertas-recuperadas' into 'develop' 
action_details avoid overlapping colors

See merge request artica/pandorafms!3792
 2021-03-04 10:43:29 +00:00
Daniel Rodriguez c26ba819ce Merge branch 'ent-6887-SAP-view-ACL' into 'develop' 
Added ACL groups in SAP view

See merge request artica/pandorafms!3747
 2021-03-04 10:36:05 +00:00