Daniel Rodriguez
|
9aaae58cc7
|
Merge branch 'ent-2323-Modo-Debug-instantáneo' into 'develop'
Added QueryResult ui type
See merge request artica/pandorafms!3517
|
2020-12-03 14:43:44 +01:00 |
|
Daniel Rodriguez
|
98c5ef7142
|
Merge branch 'ent-6619-Remote-code-execution' into 'develop'
fixed security vulnerability
See merge request artica/pandorafms!3591
|
2020-12-02 17:16:05 +01:00 |
alejandro-campos
|
8aa18a1236
|
active user password check
|
2020-12-02 16:29:45 +01:00 |
Jose Gonzalez
|
f2a94b9aa5
|
Merge
|
2020-12-02 11:38:22 +01:00 |
|
Daniel Rodriguez
|
bd17efa3dd
|
Merge branch 'ent-fix-um-permission' into 'develop'
Fixed UM permission problems.
See merge request artica/pandorafms!3675
|
2020-12-02 10:16:17 +01:00 |
Daniel Maya
|
3a0f14e7bd
|
Ent 5835 9693 error al exportar csv el log view parte 2
|
2020-12-02 10:13:22 +01:00 |
fbsanchez
|
eb67b387b9
|
Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
pandora_console/include/class/CredentialStore.class.php
|
2020-12-01 17:32:02 +01:00 |
|
alejandro-campos
|
bb32f40da9
|
added filter for bulk edition and deletion of modules
|
2020-12-01 15:50:52 +01:00 |
Luis
|
aeb7a7e9c6
|
Add decimal separator to all pandora csv
|
2020-12-01 11:56:15 +01:00 |
Junichi Satoh
|
75e070ebb0
|
Fixed UM permission problems.
|
2020-12-01 16:46:09 +09:00 |
|
fbsanchez
|
54d5529599
|
removed duplicated methods (unified in HTML class) added minor improvements
|
2020-11-30 17:50:36 +01:00 |
|
Daniel Rodriguez
|
f861744229
|
Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' into 'develop'
SQL query do not need to be cleaned
Closes pandora_enterprise#6422
See merge request artica/pandorafms!3496
|
2020-11-30 17:26:15 +01:00 |
|
Daniel Rodriguez
|
ec91ea7387
|
Merge branch 'ent-6291-cambio-uso-macros-informes' into 'develop'
Report macros now apply on showing report
See merge request artica/pandorafms!3460
|
2020-11-30 17:25:22 +01:00 |
|
Luis
|
734341bf2d
|
Ent 6148 new report permissions
|
2020-11-30 14:52:03 +01:00 |
|
Daniel Rodriguez
|
b334e817b3
|
Merge branch 'ent-6747-campos-15-a-20-macro-fields-snmp-no-funcionan' into 'develop'
Fix bug with macro fields
Closes pandora_enterprise#6747
See merge request artica/pandorafms!3628
|
2020-11-30 14:32:14 +01:00 |
|
Daniel Rodriguez
|
3801fffa6e
|
Merge branch 'ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario' into 'develop'
F2 feature
See merge request artica/pandorafms!3493
|
2020-11-30 14:28:03 +01:00 |
daniel
|
ff37a43035
|
fix errors metaconsole, report group settings
|
2020-11-30 14:27:13 +01:00 |
|
Daniel Maya
|
76ce47fea1
|
disabled Title (header) in open
|
2020-11-30 12:48:25 +01:00 |
|
Jose Gonzalez
|
649442f794
|
Updated copyrights
|
2020-11-27 13:52:35 +01:00 |
marcos
|
1ce48c812f
|
updated 2fa all user
|
2020-11-26 18:11:30 +01:00 |
|
Daniel Rodriguez
|
d08e60f13a
|
Merge branch 'ent-6741-Vulnerabilidad-SQL-injection' into 'develop'
Fix vulnerability
Closes pandora_enterprise#6741
See merge request artica/pandorafms!3622
|
2020-11-26 18:07:20 +01:00 |
|
Jose Gonzalez
|
8c26892e55
|
Allow add text
|
2020-11-26 16:58:02 +01:00 |
|
marcos
|
af863a45de
|
updates
|
2020-11-26 16:25:21 +01:00 |
|
Jose Gonzalez
|
dbfe52e383
|
Fix issues with alert fields
|
2020-11-26 13:39:17 +01:00 |
|
fbsanchez
|
df03b77b60
|
Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo
|
2020-11-26 12:57:37 +01:00 |
|
fbsanchez
|
146f3b44d9
|
Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo
|
2020-11-26 11:30:39 +01:00 |
|
marcos
|
c824972c8c
|
updates
|
2020-11-26 11:02:48 +01:00 |
|
Daniel Maya
|
1cf3381797
|
Fixed update alert actions
|
2020-11-26 10:33:32 +01:00 |
|
marcos
|
5476c96941
|
update fix
|
2020-11-25 13:40:37 +01:00 |
|
marcos
|
e3e9736fc5
|
show and hide
|
2020-11-25 13:07:38 +01:00 |
|
fbsanchez
|
d18fffb0cb
|
Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
|
2020-11-25 12:07:53 +01:00 |
|
marcos
|
06475d21ce
|
Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario
|
2020-11-25 11:08:09 +01:00 |
|
marcos
|
73f931d516
|
show and hide 2fa swtich
|
2020-11-25 10:50:06 +01:00 |
|
Marcos Alconada
|
481dd07e1b
|
requiered subject on create news
|
2020-11-25 10:38:38 +01:00 |
|
marcos
|
51322b48d7
|
Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario
|
2020-11-25 09:31:14 +01:00 |
|
Daniel Barbero Martin
|
e30506a21e
|
fix select agents builder inventory reports
|
2020-11-24 16:48:12 +01:00 |
|
alejandro-campos
|
7931f17144
|
fixed selector
|
2020-11-24 14:08:37 +01:00 |
|
marcos
|
b42cb5a30f
|
Merge remote-tracking branch 'origin/develop' into ent-6422-10782-Error-entity-en-informe-SQL-query
|
2020-11-24 08:59:44 +01:00 |
|
fbsanchez
|
a767b6c133
|
Fixes in history db settings and improved pandora_db tool
|
2020-11-23 20:16:11 +01:00 |
|
Daniel Rodriguez
|
2718558b29
|
Merge branch 'ent-6398-Poner-ojito-mostrar-passwords' into 'develop'
Ent 6398 poner ojito mostrar passwords
Closes pandora_enterprise#6398
See merge request artica/pandorafms!3488
|
2020-11-23 16:17:35 +01:00 |
|
Daniel Rodriguez
|
ee1c9b6567
|
Merge branch 'ent-6655-bug-group-creation-existing-name' into 'develop'
Fixed bug allowing updating group with duplicated name
See merge request artica/pandorafms!3593
|
2020-11-23 16:15:02 +01:00 |
|
marcos
|
5978e46141
|
add toolkit on sql query report item editor
|
2020-11-23 13:29:35 +01:00 |
|
Daniel Rodriguez
|
36d63a4869
|
Merge branch 'ent-6436-la-columna-nombre-es-muy-pequena-discovery-task-list' into 'develop'
Minor fixes discovery tasklist usability
See merge request artica/pandorafms!3506
|
2020-11-23 10:44:27 +01:00 |
|
Daniel Rodriguez
|
e8d628a049
|
Merge branch 'ent-6175-10434-problemas-con-la-creacion-y-asignacion-de-componentes-locales-en-el-campo-unit' into 'develop'
Ent 6175 10434 problemas con la creacion y asignacion de componentes locales en el campo unit
See merge request artica/pandorafms!3452
|
2020-11-20 13:23:12 +01:00 |
|
Daniel Rodriguez
|
436a88e2f4
|
Merge branch 'ent-6758-update-manager-offline-meta-doesnt-work' into 'develop'
Fxed update manager offline missing include
See merge request artica/pandorafms!3634
|
2020-11-20 10:24:00 +01:00 |
|
José González
|
32dcd8a7ca
|
Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords'
# Conflicts:
# pandora_console/include/javascript/pandora_ui.js
|
2020-11-19 15:21:58 +01:00 |
|
Daniel Rodriguez
|
e955bc7b96
|
Merge branch 'ent-6253-10593-Cambiar-option-ANY-de-las-bulk-operatiosn-por-ALL' into 'develop'
fixed errors in massive operations
See merge request artica/pandorafms!3451
|
2020-11-19 14:55:53 +01:00 |
|
daniel
|
7d0c31885c
|
fixed errors visual pie charts
|
2020-11-19 14:53:44 +01:00 |
|
Luis Calvo
|
64ed945a90
|
Fxed update manager offline missing include
|
2020-11-19 14:23:12 +01:00 |
|
Daniel Barbero Martin
|
b7d4144904
|
fix remove debug
|
2020-11-18 17:37:33 +01:00 |
|
alejandro-campos
|
7e2fc669f7
|
fixed status filter when applying changes to a module of any agent
|
2020-11-18 16:48:49 +01:00 |
|
marcos
|
13d90bb1c5
|
Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario
|
2020-11-18 12:05:57 +01:00 |
|
Jose Gonzalez
|
e0404d565a
|
Fix vulnerability
|
2020-11-17 14:49:26 +01:00 |
|
Luis Calvo
|
2ee187ae53
|
Fixed acl on discovery tasklist
|
2020-11-16 18:30:23 +01:00 |
|
Jose Gonzalez
|
8baf5df61a
|
Fix visual issue
|
2020-11-13 14:09:22 +01:00 |
|
Jose Gonzalez
|
2fdd34265f
|
WIP: Backup upload
|
2020-11-13 13:53:54 +01:00 |
|
Jose Gonzalez
|
a049ff1e16
|
WIP: Backup upload
|
2020-11-13 13:44:40 +01:00 |
|
Jose Gonzalez
|
d623606c0f
|
WIP: Backup upload
|
2020-11-13 13:38:54 +01:00 |
|
Jose Gonzalez
|
63395dd88f
|
WIP: Backup upload
|
2020-11-13 13:33:05 +01:00 |
|
Jose Gonzalez
|
1ca65e59d5
|
WIP: Backup upload
|
2020-11-13 13:31:13 +01:00 |
|
Jose Gonzalez
|
a0a1be254d
|
WIP: Backup upload
|
2020-11-13 13:28:07 +01:00 |
|
Jose Gonzalez
|
98205973a5
|
WIP: Backup upload
|
2020-11-13 11:43:26 +01:00 |
|
Jose Gonzalez
|
08cc67696a
|
WIP: Backup upload
|
2020-11-13 11:36:06 +01:00 |
|
fbsanchez
|
b8437bec79
|
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
|
2020-11-11 11:09:30 +01:00 |
|
Daniel Maya
|
ac762469b6
|
Added trim in search
|
2020-11-10 13:54:15 +01:00 |
|
Daniel Maya
|
ea0e229951
|
Fixed license expired and license trial
|
2020-11-10 12:10:25 +01:00 |
|
Daniel Rodriguez
|
01b315de3f
|
Merge branch 'ent-#10872-GUARDIA-Problemas-menus-de-modulos' into 'develop'
added check for element
See merge request artica/pandorafms!3577
|
2020-11-04 16:40:36 +01:00 |
|
Daniel Rodriguez
|
a786f5e132
|
Merge branch 'ent-6571-failazo-ha-al-perder-hilos' into 'develop'
Added server component status - crash -
See merge request artica/pandorafms!3547
|
2020-11-04 16:39:28 +01:00 |
|
Luis Calvo
|
31a8eefd2f
|
Fixed bug allowing updating group with duplicated name
|
2020-11-04 16:22:44 +01:00 |
|
fbsanchez
|
b585a4e372
|
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
|
2020-11-03 16:35:25 +01:00 |
|
alejandro-campos
|
241c90f201
|
fixed security vulnerability
|
2020-11-03 15:58:53 +01:00 |
|
fbsanchez
|
8202839888
|
warn while updating user admin > standar
|
2020-11-03 10:14:17 +01:00 |
|
fbsanchez
|
5ddb3f4421
|
title for dialog (user form)
|
2020-11-03 10:11:18 +01:00 |
|
fbsanchez
|
8b01565948
|
Avoid confirm dialog while profiles are assigned to user
|
2020-11-03 10:08:23 +01:00 |
|
fbsanchez
|
95ed4c9665
|
Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles
|
2020-11-03 10:02:45 +01:00 |
|
Daniel Rodriguez
|
d171d84595
|
Merge branch 'ent-6678-Bug-en-select-de-nodos-de-TODOS-los-items-en-metaconsola' into 'develop'
Fix combo server in reports builder
See merge request artica/pandorafms!3589
|
2020-10-30 14:43:38 +01:00 |
|
Daniel Rodriguez
|
946c548244
|
Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop'
Primeras modificaciones del filtro de eventos
See merge request artica/pandorafms!3585
|
2020-10-30 14:42:41 +01:00 |
|
Daniel Barbero Martin
|
f1080757a0
|
Fix combo server in reports builder
|
2020-10-30 13:30:59 +01:00 |
|
fbsanchez
|
326d1dac49
|
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
|
2020-10-30 10:38:30 +01:00 |
|
fbsanchez
|
20fa959a0c
|
Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles
Conflicts:
pandora_console/godmode/users/configure_user.php
|
2020-10-29 17:26:05 +01:00 |
|
fbsanchez
|
8e09a30a05
|
WIP Networklink POC
|
2020-10-29 17:20:16 +01:00 |
|
Marcos Alconada
|
f8511de008
|
fixed error 6495
|
2020-10-29 16:39:00 +01:00 |
|
Marcos Alconada
|
b972bc627a
|
Update event_edit_filter.php
|
2020-10-29 15:04:53 +01:00 |
|
marcos
|
6bcca915ba
|
resuelto el error que vaciaba el module search
|
2020-10-29 14:57:54 +01:00 |
|
Daniel Rodriguez
|
4f3e09c6c3
|
Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop'
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0
See merge request artica/pandorafms!3541
|
2020-10-29 13:43:10 +01:00 |
|
Daniel Rodriguez
|
d5a57156dc
|
Merge branch 'ent-6487-visual-console-favourites-page-constantly-reloads' into 'develop'
Fix continous reload page cased by automatic form submit
See merge request artica/pandorafms!3561
|
2020-10-29 13:22:10 +01:00 |
|
Daniel Rodriguez
|
8144d3bc95
|
Merge branch 'ent-6497-bug-en-item-group-alert-report-seleccionando-el-grupo-all' into 'develop'
Forced recursion while selecting All group - group_alert_report
See merge request artica/pandorafms!3543
|
2020-10-29 12:40:43 +01:00 |
|
Daniel Rodriguez
|
83233b6192
|
Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop'
groups_get_children and propagate update
See merge request artica/pandorafms!3545
|
2020-10-29 12:36:49 +01:00 |
|
Daniel Rodriguez
|
5ae4330121
|
Merge branch 'ent-6555-No-hay-mensaje-de-aviso-al-eliminar-perfil-del-usuario-en-metaconsola-da-error' into 'develop'
Ent 6555 no hay mensaje de aviso al eliminar perfil del usuario en metaconsola da error
See merge request artica/pandorafms!3551
|
2020-10-29 12:21:57 +01:00 |
|
fbsanchez
|
6112b3e932
|
minor fix
|
2020-10-29 10:55:07 +01:00 |
|
Daniel Rodriguez
|
7a776cd270
|
Merge branch 'ent-6469-entities-componentes-remotos' into 'develop'
Ent 6469 entities componentes remotos
Closes pandora_enterprise#6469
See merge request artica/pandorafms!3569
|
2020-10-28 17:15:59 +01:00 |
|
Daniel Rodriguez
|
8a47210dd5
|
Merge branch 'ent-6531-Bug-en-item-Simple-graph-de-informes-metaconsola' into 'develop'
fixed error report selector modules in metaconsole
See merge request artica/pandorafms!3544
|
2020-10-28 15:18:22 +01:00 |
|
Marcos Alconada
|
94cfd51501
|
Ent 6512 error en acls de alertas
|
2020-10-28 11:41:30 +01:00 |
|
Daniel Rodriguez
|
fa9f4bca95
|
Merge branch 'ent-6580-bug-en-la-edicion-de-grupos-asignando-como-padre-a-si-mismo' into 'develop'
exclude branch from select_for_Groups given group_id
See merge request artica/pandorafms!3550
|
2020-10-28 11:19:05 +01:00 |
|
fbsanchez
|
f744261821
|
minor fix
|
2020-10-27 16:03:35 +01:00 |
|
Daniel Barbero Martin
|
2b2acefa31
|
Snmp and WMI in recon task move open
|
2020-10-27 15:02:05 +01:00 |
|
alejandro-campos
|
315e522b2e
|
added check for element
|
2020-10-27 12:01:38 +01:00 |
|
Jose Gonzalez
|
be09fb8a29
|
Fixed code error
|
2020-10-26 10:36:43 +01:00 |
|
Jose Gonzalez
|
7ff518f4aa
|
Solved issues with entities
|
2020-10-26 10:34:31 +01:00 |
|
Luis Calvo
|
f3de0540fc
|
Fix continous reload page cased by automatic form submit
|
2020-10-22 19:56:13 +02:00 |