24510 Commits

Author SHA1 Message Date
Daniel Rodriguez
bc794918d4 Merge branch 'ent-5538-redireccion-incorrecta-en-pantalla-sin-permisos' into 'develop'
fixed error

See merge request artica/pandorafms!3143
2020-05-12 12:56:27 +02:00
Daniel Rodriguez
f0fd40fcca Merge branch 'ent-5675-Textos-del-sistema-de-licencias' into 'develop'
Ent 5675 textos del sistema de licencias

See merge request artica/pandorafms!3169
2020-05-12 12:54:20 +02:00
Tatiana Llorente
fabace239d Ent 5675 textos del sistema de licencias 2020-05-12 12:54:20 +02:00
Daniel Rodriguez
46f1f44883 Merge branch 'ent-5574-field-description-not-in-general-search-nor-agent-detailed' into 'develop'
Added agent description to search and agent detail

See merge request artica/pandorafms!3130
2020-05-12 12:53:32 +02:00
Alejandro Fraguas
e8461e19f3 Merge branch 'ent-5503-pop-up-imagenes-detras-de-un-server-proxy' into 'develop'
change url for pop up reverse proxy

See merge request artica/pandorafms!3168
2020-05-12 12:50:02 +02:00
José González
d1d51dcde6 Update get_file.php resolving issue with collections 2020-05-12 11:56:53 +02:00
Alejandro Fraguas
464699cbaa Merge branch 'ent-5481-agregar-nombre-a-llamada-api-get-agent-id-name-by-alias' into 'develop'
add nombre in api_get_i_name_by_alias API method

See merge request artica/pandorafms!3150
2020-05-12 09:51:09 +02:00
marcos
7938bfcd3e Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-12 09:21:35 +02:00
Jose Gonzalez
13339d5f68 Solved issue with metaconsole filemanager 2020-05-12 08:43:16 +02:00
artica
3dfef47b24 Auto-updated build strings. 2020-05-12 01:00:20 +02:00
marcos
7f282c668d Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola 2020-05-11 16:19:29 +02:00
Daniel Barbero Martin
24f4f68b33 Fixed errors in dashboards 2020-05-11 14:50:13 +02:00
Alejandro Fraguas
f2c0a62cec Merge branch 'ent-1096-integracion-cmdb' into 'develop'
CMDB integration needs

See merge request artica/pandorafms!3045
2020-05-11 13:58:50 +02:00
Alejandro Fraguas
5f1066a342 Merge branch 'ent-5412-mensaje-de-allowoverride-en-apache' into 'develop'
notify for allowoverride

See merge request artica/pandorafms!3149
2020-05-11 12:53:12 +02:00
marcos
86f52fd8e6 changed message allow override 2020-05-11 12:24:18 +02:00
Luis Calvo
1422e076ac Fixed two times encription on wmi module pass 2020-05-11 11:18:08 +02:00
Alejandro Fraguas
46b5f13350 Merge branch 'ent-5482-php-warning-visual-console-group-item' into 'develop'
Metaconsole const replaced by function on visual map

See merge request artica/pandorafms!3145
2020-05-11 10:11:28 +02:00
artica
8514cdc378 Auto-updated build strings. 2020-05-11 01:00:15 +02:00
artica
87445c28ef Auto-updated build strings. 2020-05-10 01:00:15 +02:00
artica
3c01526ea9 Auto-updated build strings. 2020-05-09 01:00:24 +02:00
Daniel Rodriguez
53ee668209 Merge branch 'ent-5701-Quitar-feature-de-chat' into 'develop'
Ent 5701 quitar feature de chat

See merge request artica/pandorafms!3158
2020-05-08 15:39:24 +02:00
Tatiana Llorente
1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
Daniel Rodriguez
b655094f3a Merge branch 'ent-5619-se-muestran-2-veces-el-mensaje-de-realizado' into 'develop'
duplicated enable/disable message

See merge request artica/pandorafms!3128
2020-05-08 15:38:24 +02:00
Daniel Rodriguez
fbd9902dc7 Merge branch 'ent-5746-problema-libreria-de-modulos' into 'develop'
add cache false on functions_module_library

See merge request artica/pandorafms!3197
2020-05-08 15:36:44 +02:00
Daniel Rodriguez
3db9247ec0 Merge branch 'ent-5757-mejoras-visuales-en-el-treeview' into 'develop'
Ent 5757 mejoras visuales en el treeview

See merge request artica/pandorafms!3200
2020-05-08 15:34:43 +02:00
Alejandro Fraguas
73ce23bfd8 Merge branch 'ent-5702-problema-de-seguridad-en-quicksell-escalado-de-privilegios-remoto' into 'develop'
1st approach avoid quick_shell vulnerability (telnet)

See merge request artica/pandorafms!3170
2020-05-08 14:16:06 +02:00
marcos
72e32ab5de add close option in toast 2020-05-08 11:32:44 +02:00
artica
36d15f3de5 Auto-updated build strings. 2020-05-08 01:00:18 +02:00
alejandro-campos
a8469413ac adaptation to centos new version: new data MemAvailable introduced 2020-05-07 17:56:29 +02:00
fbsanchez
3684bf8ea2 Minor changes tree style 2020-05-07 09:36:14 +02:00
artica
bc3e21af6d Auto-updated build strings. 2020-05-07 01:00:17 +02:00
fbsanchez
bd3ffc0c8d Tree view style review 2020-05-06 17:35:05 +02:00
artica
5ad9e5dbd7 Auto-updated build strings. 2020-05-06 01:00:18 +02:00
fbsanchez
92ff713651 1st approach 2020-05-05 18:58:45 +02:00
vgilc
d17299e290 Merge branch 'update-japanese-console-translation' into 'develop'
Japanese console translation

See merge request artica/pandorafms!3182
2020-05-05 15:25:39 +02:00
Daniel Rodriguez
acbb4b119c Merge branch 'ent-5802-No-se-pueden-crear-usuarios-en-la-meta' into 'develop'
Changed path in a required file

See merge request artica/pandorafms!3199
2020-05-05 13:46:18 +02:00
tatiana
490213dfed Changed path in a required file 2020-05-05 12:50:15 +02:00
artica
b894f63f1f Auto-updated build strings. 2020-05-05 01:00:14 +02:00
alejandro-campos
197e309129 added new module type 2020-05-04 12:22:04 +02:00
alejandro-campos
1140a4345a added new module type 2020-05-04 12:20:50 +02:00
fbsanchez
4815dce8aa H&D port filtering + control tasks cancellation while restarting server 2020-05-04 11:13:15 +02:00
fbsanchez
54a9ebd4ed Merge remote-tracking branch 'origin/develop' into ent-5708-review-discovery-h-d
Conflicts:
	pandora_server/lib/PandoraFMS/Recon/Base.pm
2020-05-04 09:52:15 +02:00
artica
12128ea2f1 Auto-updated build strings. 2020-05-04 01:00:15 +02:00
artica
7006e3febd Auto-updated build strings. 2020-05-03 01:00:14 +02:00
artica
f95fed2d79 Auto-updated build strings. 2020-05-02 01:00:15 +02:00
artica
848503babe Auto-updated build strings. 2020-05-01 01:00:14 +02:00
Alejandro Fraguas
ad5f728414 Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' into 'develop'
fix

See merge request artica/pandorafms!3196
2020-04-30 18:38:07 +02:00
marcos
e215cdc194 add cache false on functions_module_library 2020-04-30 18:20:09 +02:00
fbsanchez
55392bac47 weird json 2020-04-30 18:11:50 +02:00
fbsanchez
eaf10f7d6e weird json 2020-04-30 18:07:52 +02:00