Calvo
|
421eb1fe23
|
Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica
|
2023-12-19 18:59:07 +01:00 |
Alejandro Campos
|
c700633fce
|
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
|
2023-12-18 10:54:27 +00:00 |
daniel
|
4c11595899
|
fix name token easter eggs pandora_enterprise#12201
|
2023-12-14 16:48:10 +01:00 |
|
daniel
|
27a83a8eb5
|
Merge remote-tracking branch 'origin/develop' into ent-12201-eastern-egg-setup
Conflicts:
pandora_console/include/functions_config.php
|
2023-12-14 16:36:11 +01:00 |
Jonathan
|
5fa9cd5877
|
Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3
|
2023-12-13 11:19:32 +01:00 |
|
Jonathan
|
6e60d19193
|
#8365 ftp server ip
|
2023-12-12 15:46:42 +01:00 |
Rafael Ameijeiras
|
a2436cf60e
|
Merge branch 'ent-12620-elementos-de-lista-negra-de-deteccion-de-cambios-en-inventario-en-el-setup-no-funciona' into 'develop'
Ent 12620 elementos de lista negra de deteccion de cambios en inventario en el setup no funciona
See merge request artica/pandorafms!6745
|
2023-12-11 14:46:27 +00:00 |
Enrique Martin
|
28d6b73bd8
|
Removed services and plugin agents setup for demo
|
2023-12-11 12:12:47 +01:00 |
|
Rafael Ameijeiras
|
ce298c1e8f
|
Merge branch 'ent-12353-URL-de-Pandora-RC-en-Pandora-FMS-continua-siendo-ehorus-en-el-Setup' into 'develop'
change url pandorarc name
See merge request artica/pandorafms!6649
|
2023-12-11 08:24:46 +00:00 |
Jorge Rincon
|
725c5d964c
|
#12620 fixed blacklist items in setup
|
2023-12-07 13:09:42 +01:00 |
|
Alejandro Campos
|
0bdc6978e6
|
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
|
2023-12-05 15:30:06 +00:00 |
|
alejandro.campos@artica.es
|
4a64f023fe
|
Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo
|
2023-12-04 11:37:41 +01:00 |
|
alejandro.campos@artica.es
|
75ddb3b934
|
minor changes in demo data functionality
|
2023-12-04 11:37:12 +01:00 |
|
Enrique Martin
|
55aee67df3
|
Added GIS maps creation
|
2023-12-03 23:23:57 +01:00 |
Matias Didier
|
874e60bf55
|
Merge branch 'ent-12248-mover-token-de-configuracion-s-flow-a-la-seccion-de-netflow' into 'develop'
Ent 12248 mover token de configuracion s flow a la seccion de netflow
See merge request artica/pandorafms!6621
|
2023-11-30 13:05:46 +00:00 |
|
Jonathan
|
75d57337af
|
#11705 Fix merge conflict
|
2023-11-30 08:10:32 +01:00 |
Daniel Rodriguez
|
7f4a928f35
|
Merge branch 'ent-12243-no-funciona-integracion-pandora-pitsm-a-nivel-usuario' into 'develop'
Hide test button and setup in ITSM pandora_enterprise#12243
See merge request artica/pandorafms!6629
|
2023-11-29 17:52:26 +00:00 |
|
alejandro.campos@artica.es
|
a290203847
|
implement demo data load
|
2023-11-29 16:57:38 +01:00 |
|
Matias Didier
|
e7ad23c477
|
Merge branch 'ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico' into 'develop'
Ent 11127 poner el aviso de cantidad de modulos en cola dinamico
See merge request artica/pandorafms!6489
|
2023-11-29 09:30:08 +00:00 |
|
alejandro.campos@artica.es
|
7240bbf934
|
implement demo data load
|
2023-11-29 09:00:45 +01:00 |
|
Matias Didier
|
bda55cc3a5
|
Merge branch 'ent-11894-editor-de-links-no-actualiza-la-pagina-al-crear-o-borrar-enlaces' into 'develop'
Ent 11894 editor de links no actualiza la pagina al crear o borrar enlaces
See merge request artica/pandorafms!6373
|
2023-11-28 08:22:37 +00:00 |
|
Jonathan
|
9819c3a5ff
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-28 08:30:23 +01:00 |
|
Matias Didier
|
746eb298ea
|
Merge branch 'ent-11831-literales-de-opciones-de-menu-no-coinciden' into 'develop'
Ent 11831 literales de opciones de menu no coinciden
See merge request artica/pandorafms!6437
|
2023-11-28 07:07:58 +00:00 |
|
Jorge Rincon
|
34f9e0df49
|
Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico
|
2023-11-27 15:52:41 +01:00 |
|
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 |