Enrique Martin
|
cb63c27d2a
|
Merge branch 'ent-12687-sistema-import-export-prd' into 'develop'
Ent 12687 sistema import export prd
See merge request artica/pandorafms!6874
|
2024-02-14 12:11:16 +00:00 |
|
alejandro.campos@artica.es
|
e293bd6ca3
|
changed prd
|
2024-02-14 10:10:39 +01:00 |
|
Enrique Martin
|
5d174013e5
|
Fixed recon task snmp v3 credentials update
|
2024-02-13 15:44:09 +01:00 |
|
Enrique Martin
|
4b4a94e7fb
|
Fixed recon task snmp v3 credentials update
|
2024-02-13 15:40:31 +01:00 |
|
alejandro.campos@artica.es
|
8ff87ec93a
|
Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD
|
2024-02-13 09:36:36 +01:00 |
|
alejandro.campos@artica.es
|
731cc195ec
|
fix safe mode recovery
|
2024-02-12 17:47:46 +01:00 |
|
Alejandro Sánchez
|
680ad1b8db
|
Merge branch 'develop' into 'ent-12857-tickets-vmware-776'
# Conflicts:
# pandora_console/extras/mr/68.sql
|
2024-02-12 13:45:23 +00:00 |
|
Enrique Martin
|
d382ca4066
|
Merge remote-tracking branch 'origin/develop' into ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida
Conflicts:
pandora_console/extras/mr/68.sql
|
2024-02-12 09:29:28 +01:00 |
|
daniel
|
851b046add
|
Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
|
2024-02-12 08:05:36 +01:00 |
|
alejandro.campos@artica.es
|
ecfef0da29
|
several changes
|
2024-02-09 18:48:32 +01:00 |
|
alejandro.campos@artica.es
|
df8c14864c
|
improvements
|
2024-02-09 10:37:04 +01:00 |
|
alejandro.campos@artica.es
|
14ae2c5206
|
Merge remote-tracking branch 'origin/ent-12687-sistema-import-export-prd' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD
|
2024-02-08 11:06:58 +01:00 |
|
Daniel Maya
|
8524e7ba31
|
Merge branch 'develop' into ent-12321-widget-mapa-gis
|
2024-02-08 09:34:32 +01:00 |
|
Daniel Maya
|
5bc20f9768
|
#12687 Added message prd
|
2024-02-07 15:01:53 +01:00 |
|
alejandro
|
32c8d23a93
|
update version and adding units in datastore modules
|
2024-02-07 13:05:57 +01:00 |
|
Enrique Martin
|
f00e491738
|
Fix merge issues
|
2024-02-05 23:30:35 +01:00 |
|
daniel
|
b80f7bdeb1
|
Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
|
2024-02-05 08:05:45 +01:00 |
|
Enrique Martin
|
f7dbd8f3b2
|
Net scan improvements
|
2024-02-02 14:41:28 +01:00 |
|
daniel
|
54e4b8dbfa
|
new api 2.0
|
2024-02-02 09:15:00 +01:00 |
|
Diego Muñoz-Reja
|
774aa6a17b
|
Merge branch 'ent-12746-No-se-puede-seleccionar-template-en-NCM' into 'develop'
fixed database ncm info
See merge request artica/pandorafms!6894
|
2024-02-01 16:02:10 +00:00 |
|
alejandro.campos@artica.es
|
0df4379926
|
fixed database ncm info
|
2024-01-30 17:47:43 +01:00 |
|
Luis
|
5631f5754b
|
Merge branch 'develop' into 'ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts'
# Conflicts:
# pandora_console/extras/mr/68.sql
|
2024-01-29 14:09:51 +00:00 |
|
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 |
|
Calvo
|
1bc9bc6095
|
Fix MR
|
2024-01-23 17:52:06 +01:00 |
|
Calvo
|
7fe8bfc096
|
Merge remote-tracking branch 'origin/develop' into ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts
|
2024-01-23 10:14:58 +01:00 |
|
Luis
|
e6203ab708
|
Merge branch 'develop' into 'ent-11642-comprobacion-de-la-estructura-de-la-base-de-datos-en-772-lts'
# Conflicts:
# pandora_console/extras/mr/68.sql
|
2024-01-22 16:12:56 +00:00 |
|
Alejandro Sánchez
|
75481a9677
|
Merge branch 'develop' into 'ent-12673-eliminar-el-de-todas-las-custom-queries-en-el-discovery-de-oracle-2'
# Conflicts:
# pandora_console/extras/mr/68.sql
|
2024-01-22 10:55:47 +00:00 |
|
Matias Didier
|
f35b95f0fe
|
Merge branch 'ent-12745-falta-un-campo-en-la-tabla-tncm_agent_data' into 'develop'
Ent 12745 falta un campo en la tabla tncm agent data
See merge request artica/pandorafms!6857
|
2024-01-22 09:28:53 +00:00 |
|
Jonathan
|
30e0ed912a
|
Merge branch 'develop' into ent-12745-falta-un-campo-en-la-tabla-tncm_agent_data
|
2024-01-19 13:15:01 +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 |
|
Alejandro Sánchez
|
2b33bf84bf
|
Merge branch 'develop' into 'ent-12673-eliminar-el-de-todas-las-custom-queries-en-el-discovery-de-oracle-2'
# Conflicts:
# pandora_console/extras/mr/68.sql
|
2024-01-18 13:19:46 +00:00 |
|
alejandro
|
3839de6f6d
|
update hash oracle in migratecodes.ini
|
2024-01-18 14:18:09 +01:00 |
|
alejandro
|
f34b9c2a7e
|
mr changes
|
2024-01-18 14:01:15 +01:00 |
|
Calvo
|
f3f3c4728b
|
#11642. Fix missing sql in MR
|
2024-01-18 10:49:07 +01:00 |
|
Jonathan
|
c771127371
|
#12745 add id_agent_data ncm MR
|
2024-01-17 17:45:59 +01:00 |
|
Daniel Maya
|
e2471f817d
|
#12321 Added widget Gis map
|
2024-01-09 14:38:44 +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 |
|
miguel angel rasteu
|
53da63d7b6
|
#12132 Fix MR
|
2023-12-21 16:03:49 +01:00 |
|
Diego Muñoz-Reja
|
6114c6a37a
|
Merge branch 'ent-12236-varios-bugs-en-modulos-predictivos-de-politica' into 'develop'
Policy capacity planning modules. JS errors
See merge request artica/pandorafms!6650
|
2023-12-21 10:57:42 +00:00 |
|
miguel angel rasteu
|
d84300f2c7
|
#11494 Add widget in database
|
2023-12-20 13:21:43 +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 |
|
Matias Didier
|
9158b43945
|
Merge branch 'ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql' into 'develop'
move extension translate_string and file_repo pandora_enterprise#12333
See merge request artica/pandorafms!6706
|
2023-12-15 11:49:11 +00:00 |
|
Daniel Rodriguez
|
3fe41179e0
|
Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop'
Ent 12216 entradas fantasma para elementos de discovery offline
See merge request artica/pandorafms!6740
|
2023-12-15 09:22:10 +00:00 |
|