Rafael Ameijeiras
|
793b6502ab
|
Merge branch 'ent-10529-token-session_timeout-se-desborda-con-valor-9999999999' into 'develop'
Ent 10529 token session timeout se desborda con valor 9999999999
See merge request artica/pandorafms!6425
|
2023-11-27 12:05:29 +00:00 |
|
Rafael Ameijeiras
|
cf65c66c38
|
Merge branch 'ent-12177-en-gestion-de-versiones-obsolescencia-planeada-al-subir-una-supuesta-imagen-guarda-y-se-va-al' into 'develop'
Ent 12177 en gestion de versiones obsolescencia planeada al subir una supuesta imagen guarda y se va al
See merge request artica/pandorafms!6560
|
2023-11-27 11:55:29 +00:00 |
|
Rafael Ameijeiras
|
7b4423148e
|
Merge branch 'ent-11655-fe-de-erratas-en-idioma-ingles-por-consola-web' into 'develop'
Ent 11655 fe de erratas en idioma ingles por consola web
See merge request artica/pandorafms!6416
|
2023-11-27 11:53:17 +00:00 |
miguel angel rasteu
|
a4cd6d7fe1
|
#12138 Resolve conflict
|
2023-11-27 11:43:24 +01:00 |
|
Rafael Ameijeiras
|
cd8652f9e6
|
Merge branch 'ent-12121-cve-2023-41814-xss-en-file-manager' into 'develop'
Ent 12121 cve 2023 41814 xss en file manager
See merge request artica/pandorafms!6499
|
2023-11-27 10:25:54 +00:00 |
|
miguel angel rasteu
|
262affeb74
|
Merge branch 'develop' into ent-12138-eliminar-agent-access-graph
|
2023-11-27 08:18:35 +01:00 |
Jorge Rincon
|
1f51b0475e
|
#12201 Added configuration in the setup for easter egg
|
2023-11-24 13:12:12 +01:00 |
alejandro.campos@artica.es
|
a1916dc4b9
|
implement demo data load
|
2023-11-24 12:56:21 +01:00 |
|
alejandro.campos@artica.es
|
c7770ec4f1
|
implement demo data load
|
2023-11-23 17:59:22 +01:00 |
Jonathan
|
4f707a5a1b
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-23 09:27:46 +01:00 |
|
alejandro.campos@artica.es
|
0868c0c995
|
implement demo data load
|
2023-11-21 14:26:33 +01:00 |
|
alejandro.campos@artica.es
|
d6bffbade1
|
implement demo data load
|
2023-11-20 16:52:49 +01:00 |
|
Jorge Rincon
|
e60b97c234
|
Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico
|
2023-11-20 15:32:06 +01:00 |
|
alejandro.campos@artica.es
|
5eb5df6190
|
change url pandorarc name
|
2023-11-10 13:13:57 +01:00 |
|
alejandro.campos@artica.es
|
1fcc263046
|
implemented demo data load
|
2023-11-10 11:24:34 +01:00 |
Ramon Novoa
|
8ec1432414
|
Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner
|
2023-11-10 09:53:17 +01:00 |
|
Rafael Ameijeiras
|
72ebccd981
|
Merge branch 'ent-12322-errores-en-los-menus-de-paginacion-de-operating-systems-y-alert-details' into 'develop'
Ent 12322 errores en los menus de paginacion de operating systems y alert details
See merge request artica/pandorafms!6642
|
2023-11-10 08:49:54 +00:00 |
|
Jonathan
|
679386a964
|
#12322 fix pagination
|
2023-11-08 10:38:33 +01:00 |
Daniel Cebrian
|
cacb524ece
|
#12376 changed label in new token
|
2023-11-07 13:28:35 +01:00 |
|
Daniel Cebrian
|
8f8e5ecf45
|
#12376 multiple changes in general tactical view
|
2023-11-07 13:18:44 +01:00 |
daniel
|
f71479033d
|
Hide test button and setup in ITSM pandora_enterprise#12243
|
2023-11-06 13:06:38 +01:00 |
|
Jonathan
|
54514b043d
|
#12248 move nflow to netflow config
|
2023-11-03 11:35:22 +01:00 |
|
Jonathan
|
1362ff0967
|
Revert "#12248 change setup netflow tab"
This reverts commit 1412480b4d.
|
2023-11-03 11:32:54 +01:00 |
|
Jonathan
|
1412480b4d
|
#12248 change setup netflow tab
|
2023-11-03 09:54:56 +01:00 |
|
miguel angel rasteu
|
84bc687d5d
|
#12177 Fix conflict
|
2023-10-30 09:53:00 +01:00 |
|
alejandro.campos@artica.es
|
1fd45fb95f
|
implement demo data feature
|
2023-10-26 19:05:07 +02:00 |
|
Daniel Cebrian
|
5e497db840
|
#11126 moved token vulnerabilities to enterprise
|
2023-10-25 11:48:49 +02:00 |
|
Daniel Cebrian
|
a862a8018c
|
#11126 added token in config agent and setup
|
2023-10-24 18:02:14 +02:00 |
|
miguel angel rasteu
|
35efc20fc7
|
#12177 Fix message
|
2023-10-13 12:58:21 +02:00 |
|
miguel angel rasteu
|
2062169f2f
|
#12177 Fix upload os icon
|
2023-10-13 12:55:58 +02:00 |
|
miguel angel rasteu
|
5060398661
|
#11206 Fix conflict
|
2023-10-13 09:00:03 +02:00 |
|
miguel angel rasteu
|
9a57cc550e
|
#12192 Fix pandora itsm url
|
2023-10-11 16:31:48 +02:00 |
|
Rafael Ameijeiras
|
dda7c2a0c0
|
Merge branch 'ent-12205-interfaz-configuracion-ehorus-pandora-rc-a-nivel-de-usuario-ha-desaparecido' into 'develop'
Ent 12205 interfaz configuracion ehorus pandora rc a nivel de usuario ha desaparecido
See merge request artica/pandorafms!6544
|
2023-10-11 07:18:34 +00:00 |
|
miguel angel rasteu
|
f22fd10659
|
#12205 Fix url
|
2023-10-10 13:44:57 +02:00 |
|
miguel angel rasteu
|
23c5836ddc
|
#12205 Change ehorus images
|
2023-10-10 11:34:11 +02:00 |
|
miguel angel rasteu
|
133826b498
|
#12205 Fix ehorus conf interfaz
|
2023-10-10 09:57:09 +02:00 |
|
alejandro.campos@artica.es
|
0e0b5bba43
|
Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual
|
2023-10-09 14:17:25 +02:00 |
|
Alejandro Campos
|
0f381b0db7
|
Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
# pandora_console/extras/mr/66.sql
|
2023-10-03 13:11:09 +00:00 |
Matias Didier
|
9e4903e545
|
Merge branch 'ent-12145-16086-gis-no-carga-en-mapas' into 'develop'
Ent 12145 16086 gis no carga en mapas
See merge request artica/pandorafms!6514
|
2023-10-03 08:52:21 +00:00 |
|
alejandro.campos@artica.es
|
0771094e85
|
minor changes
|
2023-10-02 16:42:32 +02:00 |
|
miguel angel rasteu
|
3f41e4f32b
|
#12138 delete agent access graph
|
2023-10-02 16:24:23 +02:00 |
|
alejandro.campos@artica.es
|
85598d5012
|
Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual
|
2023-09-28 16:36:59 +02:00 |
|
Jonathan
|
6db13cc55a
|
merge conflict solution
|
2023-09-28 13:14:49 +02:00 |
|
Jonathan
|
a1d170cf0f
|
#12145 remove maxlength
|
2023-09-28 11:47:58 +02:00 |
|
Jonathan
|
c577fedff4
|
#12145 remove maxlength
|
2023-09-28 11:46:15 +02:00 |
|
alejandro.campos@artica.es
|
3f2caf9404
|
some gotty changes
|
2023-09-27 18:28:12 +02:00 |
|
miguel angel rasteu
|
d6faec76d7
|
#12121 Clear html tag characters to prevent XSS attacks
|
2023-09-26 09:57:39 +02:00 |
|
alejandro.campos@artica.es
|
19a9f82fe1
|
gotty changes
|
2023-09-25 19:08:24 +02:00 |
|
Jonathan
|
70e3707b64
|
#11705 group extra id heredity event custom id
|
2023-09-25 12:22:10 +02:00 |
|
Jorge Rincon
|
01bf91f213
|
#11127 Added token Number of modules in queue
|
2023-09-22 13:13:06 +02:00 |
|
alejandro.campos@artica.es
|
6f8212ed40
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-20 15:46:47 +02:00 |
|
daniel
|
802f0bf83b
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-12 12:37:31 +02:00 |
|
daniel
|
5093d54137
|
ITSM pandora_enterprise#11471
|
2023-09-11 18:14:32 +02:00 |
|
Jorge Rincon
|
2c430929cb
|
#11831 Fixed menu option literals
|
2023-09-11 16:53:52 +02:00 |
|
miguel angel rasteu
|
99f92b9bec
|
#10676 Fix truncate text
|
2023-09-11 10:09:34 +02:00 |
|
daniel
|
3d5a5c856b
|
ITSM pandora_enterprise#11471
|
2023-09-08 13:09:03 +02:00 |
|
miguel angel rasteu
|
4b5dcff3cc
|
#10529 Fix token session timeout
|
2023-09-08 09:26:08 +02:00 |
|
alejandro.campos@artica.es
|
318fa38721
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-07 17:44:51 +02:00 |
|
alejandro.campos@artica.es
|
753851410e
|
implemented os version management
|
2023-09-06 17:02:15 +02:00 |
|
alejandro.campos@artica.es
|
f8911bcf9c
|
implemented os version management
|
2023-09-06 17:00:16 +02:00 |
|
Jorge Rincon
|
0cd43b8315
|
fixed web console erratas
|
2023-09-06 15:45:35 +02:00 |
|
daniel
|
fce86cb2ac
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-06 07:50:27 +02:00 |
|
daniel
|
a059f18b4b
|
ITSM pandora_enterprise#11471
|
2023-09-04 16:36:58 +02:00 |
|
Jorge Rincon
|
aead8d006e
|
#11894 Fixed links does not update the page when creating or deleting links
|
2023-08-29 14:11:32 +02:00 |
|
Jonathan
|
d9e897568a
|
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
|
2023-08-24 10:06:19 +02:00 |
|
Jonathan
|
ab50a519ea
|
#10639 version 2 datepicker
|
2023-08-24 09:36:15 +02:00 |
|
daniel
|
512d5331d3
|
ITSM pandora_enterprise#11471
|
2023-08-23 18:52:06 +02:00 |
|
daniel
|
5a61f074d7
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-22 09:22:11 +02:00 |
|
miguel angel rasteu
|
970cc997cc
|
#11051 Fix conflict
|
2023-08-21 08:25:53 +02:00 |
|
daniel
|
a63824d802
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/66.sql
pandora_console/godmode/users/user_management.php
|
2023-08-21 08:08:34 +02:00 |
|
Rafael Ameijeiras
|
46e5d4edcd
|
Merge branch 'ent-11022-mejora-en-visualizacion-de-licencia' into 'develop'
Ent 11022 mejora en visualizacion de licencia
See merge request artica/pandorafms!6204
|
2023-08-18 06:35:41 +00:00 |
|
daniel
|
8bc65474f0
|
ITSM pandora_enterprise#11471
|
2023-08-16 16:52:57 +02:00 |
|
daniel
|
64c7f56235
|
ITSM pandora_enterprise#11471
|
2023-08-14 10:59:56 +02:00 |
|
daniel
|
133eef456a
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-14 08:14:34 +02:00 |
|
Jorge Rincon
|
5a440f1078
|
#11851 fixed setup interval editor
|
2023-08-09 09:47:09 +02:00 |
|
daniel
|
7f82273dc4
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/65.sql
|
2023-08-09 08:59:01 +02:00 |
|
Rafael Ameijeiras
|
019efcb124
|
Merge branch 'ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro' into 'develop'
Ent 11668 noticias en consola tienen fondo blanco en tema oscuro
See merge request artica/pandorafms!6182
|
2023-08-04 06:45:42 +00:00 |
|
Rafael Ameijeiras
|
b2821c0db3
|
Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop'
Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola
See merge request artica/pandorafms!6249
|
2023-08-04 06:34:35 +00:00 |
|
miguel angel rasteu
|
1009404bfd
|
Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro
|
2023-08-03 13:42:49 +02:00 |
Daniel Maya
|
ddcfa02e6f
|
#11739 Fixed date_format 2
|
2023-08-03 12:51:50 +02:00 |
|
miguel angel rasteu
|
1dc24cdfb4
|
#11668 Fix black theme
|
2023-08-03 12:22:20 +02:00 |
|
Daniel Maya
|
8bbaa11ce3
|
resolved conflict
|
2023-07-31 09:44:46 +02:00 |
|
miguel angel rasteu
|
95e17b46bf
|
Merge branch 'develop' into ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola
|
2023-07-31 09:03:03 +02:00 |
Daniel Rodriguez
|
42a5fc0716
|
Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop'
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados
See merge request artica/pandorafms!6051
|
2023-07-27 13:08:05 +00:00 |
|
alejandro.campos@artica.es
|
6114787764
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-27 13:32:26 +02:00 |
|
Daniel Rodriguez
|
84f61c9022
|
Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop'
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada
See merge request artica/pandorafms!6028
|
2023-07-27 10:27:55 +00:00 |
|
Daniel Rodriguez
|
c2d7c10442
|
Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop'
remove legacy visual console
See merge request artica/pandorafms!6140
|
2023-07-26 11:09:44 +00:00 |
|
daniel
|
1bf7f1e36e
|
ITSM pandora_enterprise#11471
|
2023-07-21 14:23:42 +02:00 |
|
Daniel Rodriguez
|
4148074996
|
Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop'
added setup token
See merge request artica/pandorafms!6133
|
2023-07-21 07:23:33 +00:00 |
|
daniel
|
3e2c2990df
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-07-20 08:28:36 +02:00 |
|
daniel
|
1f1b85561c
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-19 11:39:06 +02:00 |
|
daniel
|
5cf31fc77e
|
ITSM fixed pandora_enterprise#11471
|
2023-07-19 11:36:03 +02:00 |
|
daniel
|
9a72d0740c
|
ITSM fixed pandora_enterprise#11471
|
2023-07-18 15:13:08 +02:00 |
|
Rafael Ameijeiras
|
06d3664b2f
|
Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop'
Ent 10254 [#15114]Añadir timeout y secondary server a AD
See merge request artica/pandorafms!6091
|
2023-07-18 10:14:29 +00:00 |
|
miguel angel rasteu
|
fd56631ae4
|
#11713 Fix action button title
|
2023-07-14 13:07:04 +02:00 |
Diego Muñoz-Reja
|
57058c4f9c
|
Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop'
Ent 11266 no se habilita el log de consola en 770 ni 771
See merge request artica/pandorafms!6001
|
2023-07-13 07:55:47 +00:00 |
|
daniel
|
d3412a7ad1
|
add filter events comments pandora_enterprise#11387
|
2023-07-10 16:26:33 +02:00 |
|
Matias Didier
|
a575c3028f
|
Merge branch 'ent-11037-modificar-etiqueta' into 'develop'
Ent 11037 modificar etiqueta
See merge request artica/pandorafms!5795
|
2023-07-07 11:57:33 +00:00 |
|
Daniel Cebrian
|
496058e144
|
Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled
|
2023-07-06 12:12:23 +02:00 |
|
miguel angel rasteu
|
4ff400f54c
|
#11022 Add agent usage details
|
2023-07-03 13:18:50 +02:00 |