Commit Graph

21191 Commits

Author SHA1 Message Date
fbsanchez f046069de1 old-school style setup 2021-03-24 17:49:42 +01:00
fbsanchez 12767683dc minor fixes 2021-03-24 16:25:27 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez ac1c3398fe Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 2021-03-24 16:05:08 +01:00
marcos b4cc075870 resolved error with modal module detail on agent detail 2021-03-24 14:10:46 +01:00
fbsanchez d312f764ed Hack to use old functions from PandoraDB 2021-03-24 13:43:14 +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
marcos eaed8aa09a fixed visual error 2021-03-24 13:10:29 +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
Jose Gonzalez af98637680 Fix some documentary issues 2021-03-24 12:45:25 +01:00
Daniel Rodriguez ce2f4ec7cc Merge branch 'ent-7112-bugs-consola-visual-y-dashboards' into 'develop'
Command center

See merge request artica/pandorafms!3887
2021-03-24 11:43:52 +00:00
daniel 774fc9ebe5 Command center 2021-03-24 11:43:51 +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
artica 00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
Daniel Rodriguez 2597c2c7fc Merge branch 'ent-7188-bug-visual-en-tactical-view-metaconsola' into 'develop'
fixed visual error

See merge request artica/pandorafms!3940
2021-03-23 15:56:02 +00:00
Daniel Rodriguez 61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop'
add tooltip service name

See merge request artica/pandorafms!3783
2021-03-23 15:55:28 +00:00
Marcos Alconada 302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
marcos 90c825888a fixed visual error 2021-03-23 15:12:57 +01:00
Daniel Rodriguez fbd41b086d Merge branch 'ent-7102-ventana-de-refresco-visual-console-no-desaparece' into 'develop'
Fixed refresh auto hide on visual console

See merge request artica/pandorafms!3883
2021-03-23 12:04:28 +00: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
Daniel Rodriguez 0a31f7f165 Merge branch 'ent-7185-snmp-browser-ventana-de-info-de-OID-descuadrada' into 'develop'
fixed visual error

See merge request artica/pandorafms!3942
2021-03-23 09:29:39 +00:00
Daniel Rodriguez f92c75639a Merge branch 'ent-7089-11446-trazas-en-el-codigo-de-release' into 'develop'
Removed extra verbosity

See merge request artica/pandorafms!3899
2021-03-23 09:29:05 +00:00
artica b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
Daniel Rodriguez 67c0968864 Merge branch 'ent-7190-bug-icono-wux-en.vista-de-modulos' into 'develop'
fixed visual error

See merge request artica/pandorafms!3941
2021-03-22 16:59:57 +00:00
marcos 51ea2d569d fixed visual error 2021-03-22 17:02:30 +01:00
marcos 69fe389afc fixed visual error 2021-03-22 16:42:19 +01:00
marcos adadd40399 fixed visual error 2021-03-22 16:34:29 +01:00
marcos b6c02bd95c fixed visual error 2021-03-22 15:21:09 +01:00
daniel b258f409b9 Mode ghost for disabled modules and agents 2021-03-22 14:10:14 +00:00
Daniel Rodriguez 390d9df706 Merge branch 'ent-7173-Iconos-de-creacion-de-items-en-consolas-visuales-apenas-se-ven' into 'develop'
fixed visuals errors black theme

See merge request artica/pandorafms!3937
2021-03-22 12:48:39 +00: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
Daniel Rodriguez 8db123d364 Merge branch 'ent-7180-spinner-de-snmp-browere-ha-desaparecido' into 'develop'
fixed spinner bug

See merge request artica/pandorafms!3933
2021-03-22 12:46:02 +00:00
Daniel Rodriguez a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop'
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
2021-03-22 12:39:59 +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
artica 49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica 2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica 3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
marcos ebf912437b fixed error with sort function 2021-03-18 18:05:53 +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 Barbero Martin 6d6b9fe5b9 fixed visuals errors black theme 2021-03-18 17:32:21 +01: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 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
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
marcos bfaaba9dbd fixed spinner bug 2021-03-18 12:08:02 +01:00
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
fbsanchez 2862afb7f5 Multicolumn setup for performance and visual settings 2021-03-16 13:00:24 +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
alejandro.campos@artica.es 373ab32bb5 Add pagination to commands view 2021-03-16 11:54:40 +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 0ad3e3fd8b Merge branch 'develop' into 'ent-6801-No-deberian-poder-añadirse-acciones-a-alertas-generadas-por-politicas'
# Conflicts:
#   pandora_console/godmode/alerts/alert_list.list.php
2021-03-16 08:41:55 +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
fbsanchez 02b2eec65d Modules alphabetically sorted in Discovery review 2021-03-15 15:16:49 +01:00
marcos 95787e2fe8 fixed visual style error 2021-03-15 14:38:20 +01:00
fbsanchez c20c206a5f Fixed task edit url when nof fully defined (custom-script) 2021-03-15 14:37:08 +01:00
Daniel Maya e4e3007def Fixed img 2021-03-15 13:32:25 +01:00
Daniel Barbero Martin b78f4093ac fixed error tree groups agent edition metaconsole 2021-03-15 13:31:24 +01:00
Daniel Barbero Martin bf4710ba93 fixed error events reports 2021-03-15 13:26:29 +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
alejandro.campos@artica.es f833429695 restricted action creation on alerts created from policy 2021-03-11 12:38:42 +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