daniel
|
00f9098f56
|
Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql
Conflicts:
pandora_console/extras/mr/68.sql
pandora_console/pandoradb.sql
|
2024-01-25 15:57:20 +01:00 |
Daniel Cebrian
|
fadb70d740
|
Merge branch 'develop' into ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos
|
2024-01-19 13:06:37 +01:00 |
Jonathan
|
72d34ef99b
|
#12435 fix conflict merge develop
|
2024-01-08 13:14:07 +01:00 |
|
Daniel Cebrian
|
22baa45387
|
#12537 new icons for notifications
|
2024-01-03 11:39:15 +01:00 |
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 |
|
Calvo
|
e41dc13ac2
|
WIP: Policy synthetic op: Creating modules
|
2023-12-19 18:37:49 +01:00 |
Daniel Rodriguez
|
d4e6c09acb
|
Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop'
implement demo data feature
See merge request artica/pandorafms!6606
|
2023-12-19 15:40:09 +00:00 |
|
daniel
|
855fc32a7d
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/javascript/pandora.js
pandora_console/include/styles/pandora.css
|
2023-12-19 09:39:24 +01:00 |
|
Daniel Rodriguez
|
348c48d974
|
Merge branch 'ent-12631-nuevo-modo-de-los-modulos-ignorar-desconocidos-ignore-unknown-parte-de-consola' into 'develop'
Ent 12631 Nuevo modo de los modulos: ignorar desconocidos (Ignore unknown). Parte de Consola
See merge request artica/pandorafms!6757
|
2023-12-18 13:40:21 +00: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
|
8aeee6d876
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
|
2023-12-18 11:15:18 +01:00 |
|
Jonathan
|
c6d29ea60e
|
#12435 external link users fix
|
2023-12-14 16:59:39 +01:00 |
|
daniel
|
3cb4b5cce4
|
Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/extras/mr/67.sql
pandora_console/operation/menu.php
|
2023-12-14 11:21:51 +01:00 |
|
daniel
|
2890fd3dab
|
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-12-14 11:05:29 +01:00 |
|
daniel
|
27d76a0890
|
fix error cv item module graph periodicity mode pandora_enterprise#9640
|
2023-12-14 11:03:45 +01:00 |
|
Daniel Cebrian
|
464ad467aa
|
#12631 created new token Ignore unknown for agent and modules
|
2023-12-12 15:30:10 +01:00 |
|
Jonathan
|
78bb8e0bae
|
#8365 ix merge conflict
|
2023-12-07 10:58:45 +01:00 |
miguel angel rasteu
|
0337afcdaf
|
#12138 Fix SQL code
|
2023-12-07 10:21:57 +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 |
|
Daniel Rodriguez
|
39c6420d2c
|
Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop'
Ent 11763 15982 regex en busqueda de eventos
See merge request artica/pandorafms!6512
|
2023-12-01 08:44:46 +00:00 |
|
Jonathan
|
c41b360a6e
|
#8365 merge conflict
|
2023-11-30 12:04:28 +01:00 |
|
daniel
|
d5c24609d6
|
add tables merge process pandora_enterprise#12352
|
2023-11-30 11:21:54 +01:00 |
Rafael Ameijeiras
|
6a998c79ae
|
Merge branch 'ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente' into 'develop'
Ent 12095 correlacion de alertas con field event user comment no funciona adecuadamente
See merge request artica/pandorafms!6639
|
2023-11-30 09:24:33 +00:00 |
|
Rafael Ameijeiras
|
0957a87dcb
|
Merge branch 'ent-11705-15916-campo-editable-en-vista-de-eventos' into 'develop'
Ent 11705 15916 campo editable en vista de eventos
See merge request artica/pandorafms!6486
|
2023-11-30 09:18:28 +00:00 |
Daniel Maya
|
544997d30c
|
Merge branch 'develop' into ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente
|
2023-11-29 15:44:04 +01:00 |
|
Jonathan
|
f86a3e60e8
|
#11763 save filter regex on bbdd
|
2023-11-29 11:14:40 +01:00 |
|
Jonathan
|
9819c3a5ff
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-28 08:30:23 +01:00 |
|
daniel
|
3f3e8e42bc
|
move extension translate_string and file_repo pandora_enterprise#12333
|
2023-11-28 08:13:00 +01:00 |
|
Jonathan
|
def169abb8
|
Merge branch 'develop' into ent-8365-ncm-fase-3
|
2023-11-28 07:58:50 +01:00 |
|
Daniel Cebrian
|
09708255aa
|
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
|
2023-11-27 13:34:33 +01:00 |
|
Daniel Maya
|
d8e1dc4e7c
|
#12095 resolved conflict
|
2023-11-27 12:11:13 +01:00 |
|
miguel angel rasteu
|
a4cd6d7fe1
|
#12138 Resolve conflict
|
2023-11-27 11:43:24 +01:00 |
Jorge Rincon
|
2c0a88f7da
|
Merge branch 'develop' into ent-11691-15801-feature-token-para-ignorar-desconocidos-en-grafica-simple
|
2023-11-27 09:14:04 +01:00 |
|
miguel angel rasteu
|
262affeb74
|
Merge branch 'develop' into ent-12138-eliminar-agent-access-graph
|
2023-11-27 08:18:35 +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 |
|
Jonathan
|
a277e56672
|
#8365 NCM v3 rename snipet to snippet
|
2023-11-22 16:47:13 +01:00 |
|
Jonathan
|
0a9e127576
|
#8365 NCM v3 snipets
|
2023-11-22 16:12:37 +01:00 |
|
Daniel Cebrian
|
b23e4330a6
|
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
|
2023-11-14 10:51:25 +01:00 |
|
daniel
|
613d1eb9cb
|
fix error sql edit agents to conected metaconsole pandora_enterprise#12449
|
2023-11-14 09:16:47 +01:00 |
|
Jorge Rincon
|
98bc73a83a
|
#8365 Fix ncm report for multiple agents
|
2023-11-08 14:40:47 +01:00 |
|
Daniel Maya
|
84ee69b435
|
#12095 remove user_comment
|
2023-11-07 15:56:23 +01:00 |
|
Daniel Cebrian
|
ba64bfb882
|
#11126 refactored
|
2023-11-06 15:49:19 +01:00 |
|
Jonathan
|
98332d728e
|
#8365 change name ncm agent data
|
2023-10-31 16:55:35 +01:00 |
|
Jonathan
|
b327c824da
|
#8365 NCM new special templates
|
2023-10-31 13:45:26 +01:00 |
|
Daniel Cebrian
|
0699759b60
|
#11126 fixed table cve
|
2023-10-31 11:24:45 +01:00 |
|
Daniel Cebrian
|
5088149d5c
|
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
|
2023-10-31 10:08:58 +01:00 |
|
Jonathan
|
307fd7b8cb
|
#8365 remove fk tncm_queue
|
2023-10-30 10:52:13 +01:00 |
|
Jonathan
|
63c74e2aa9
|
#8365 recovery after vscode revert error
|
2023-10-30 08:55:21 +01:00 |
|
Jonathan
|
e062db2439
|
#8365 NCM add backup id to ncm queue
|
2023-10-30 08:39:20 +01:00 |
|
alejandro.campos@artica.es
|
1fd45fb95f
|
implement demo data feature
|
2023-10-26 19:05:07 +02:00 |