Tatiana Llorente
|
b99298786e
|
Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario
|
2020-05-19 08:20:04 +02:00 |
Daniel Rodriguez
|
1bc22adecd
|
Merge branch 'ent-5789-cierre-ventanas-de-notificaciones' into 'develop'
add close option in toast
See merge request artica/pandorafms!3204
|
2020-05-19 08:19:04 +02:00 |
artica
|
d2c2ae7502
|
Auto-updated build strings.
|
2020-05-19 01:00:16 +02:00 |
Alejandro Fraguas
|
89494635de
|
Merge branch 'ent-5236-docker-centos-7' into 'develop'
minor fix php74 => php72
See merge request artica/pandorafms!3214
|
2020-05-18 13:48:57 +02:00 |
fbsanchez
|
1206e6dd11
|
minor fix php74 => php72
|
2020-05-18 13:46:31 +02:00 |
|
Alejandro Fraguas
|
9c382bb598
|
Merge branch 'ent-5816-Modificacion-plugins-pandora_mem-y-pandora_mem_used-del-agente-linux' into 'develop'
adaptation to centos new version: new data MemAvailable introduced
See merge request artica/pandorafms!3202
|
2020-05-18 12:15:18 +02:00 |
marcos
|
fc5c5fd60d
|
Merge remote-tracking branch 'origin/develop' into ent-5524-backups-de-la-base-de-datos-desde-la-consola
|
2020-05-18 10:28:32 +02:00 |
|
artica
|
e8dd2b13c7
|
Auto-updated build strings.
|
2020-05-18 01:00:13 +02:00 |
|
artica
|
eece9281e2
|
Auto-updated build strings.
|
2020-05-17 01:00:13 +02:00 |
|
artica
|
71cb3e0164
|
Auto-updated build strings.
|
2020-05-16 01:00:14 +02:00 |
|
artica
|
277a610709
|
Auto-updated build strings.
|
2020-05-15 01:00:15 +02:00 |
|
fbsanchez
|
585f0f011e
|
WIP cluster rebuild
|
2020-05-14 17:49:02 +02:00 |
|
fbsanchez
|
57ccd783b0
|
Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster'
|
2020-05-14 17:42:58 +02:00 |
|
Alejandro Fraguas
|
5f598c2dcc
|
Merge branch 'ent-5236-docker-centos-7' into 'develop'
Docker centos7
See merge request artica/pandorafms!3136
|
2020-05-14 16:07:18 +02:00 |
Alejandro Campos
|
1c0f309047
|
Merge branch 'develop' into 'ent-1193-Comprobar-codigo-de-estado-HTTP'
# Conflicts:
# pandora_console/extras/mr/38.sql
|
2020-05-14 15:44:07 +02:00 |
|
Alejandro Fraguas
|
aaf64e591c
|
Merge branch 'ent-5708-review-discovery-h-d' into 'develop'
Ent 5708 review discovery h d
See merge request artica/pandorafms!3195
|
2020-05-14 10:32:43 +02:00 |
|
artica
|
44b5f2671e
|
Auto-updated build strings.
|
2020-05-14 01:00:51 +02:00 |
|
fbsanchez
|
206970d143
|
fixes
|
2020-05-13 17:06:18 +02:00 |
|
fbsanchez
|
ee51814650
|
fixes
|
2020-05-13 17:02:07 +02:00 |
|
fbsanchez
|
bd6b57e8c3
|
Improvements in log details v10
|
2020-05-13 16:43:20 +02:00 |
|
fbsanchez
|
6bbb9d5d9b
|
minor fix
|
2020-05-13 12:43:47 +02:00 |
|
fbsanchez
|
694d82e522
|
avoid div by 0 error while scanning networks with no hosts
|
2020-05-13 12:37:08 +02:00 |
|
Alejandro Fraguas
|
3db0f557c9
|
Merge branch 'ent-4852-api-get-the-mc-event-id-from-console-event-id' into 'develop'
Ent 4852 api get the mc event id from console event
See merge request artica/pandorafms!3151
|
2020-05-13 11:24:43 +02:00 |
|
artica
|
9fc993519b
|
Auto-updated build strings.
|
2020-05-13 01:00:20 +02:00 |
José González
|
e435c09a01
|
Update get_file.php with lastest corrections
|
2020-05-12 18:01:47 +02:00 |
|
Daniel Rodriguez
|
5cab51c99d
|
Merge branch 'ent-5554-Creador-de-mapas-de-red-se-vuelve-inoperable-despues-de-borrar-un-nodo' into 'develop'
fix accessing wrong index after deletion of node
See merge request artica/pandorafms!3122
|
2020-05-12 12:59:12 +02:00 |
|
Daniel Rodriguez
|
bd5b320725
|
Merge branch 'ent-5559-bug-al-anadir-nuevos-permisos-en-active-directory-advanced-permissions' into 'develop'
Ent 5559 bug al anadir nuevos permisos en active directory advanced permissions
See merge request artica/pandorafms!3174
|
2020-05-12 12:57:55 +02:00 |
|
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 |