tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
38,034 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

1138 Commits

Author SHA1 Message Date
Rafael Ameijeiras d62407dd4a Merge branch 'ent-12075-registro-de-nodos-ha-en-metaconsola' into 'develop' 
Update database targets in HA environments using metaconsole

See merge request artica/pandorafms!6956
 2024-02-26 16:28:57 +00:00
Enrique Martin 78702547c8 Fixed table field 2024-02-23 14:23:22 +01:00
alejandro.campos@artica.es c9bde8d90a Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-23 11:14:17 +01:00
Enrique Martin 633ee5ff2a FIx issues from ticket 10847 2024-02-22 15:45:04 +01:00
alejandro.campos@artica.es 7773967c71 move mr 2024-02-21 10:11:37 +01:00
alejandro.campos@artica.es 1991b74b9b Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-21 10:05:11 +01:00
Rafael Ameijeiras 0224bda78c Merge branch 'ent-12195-15835-Safe-operation-mode-habilita-modulos-deshabilitados-en-los-modulos-al-recuperarse' into 'develop' 
fix safe mode recovery

See merge request artica/pandorafms!6930
 2024-02-21 07:59:38 +00:00
Enrique Martin 5e49200f72 Update database targets in HA environments using metaconsole 2024-02-20 14:01:32 +01:00
alejandro 53d7b13f97 update version 2024-02-19 12:10:02 +01:00
alejandro.campos@artica.es 100f437a7a change regex search in events 2024-02-16 10:30:05 +01:00
alejandro.campos@artica.es df7435132a change regex search in events 2024-02-16 10:10:38 +01:00
Alejandro Campos 9590b04e83 Merge branch 'develop' into 'ent-12882-Widget-ITSM-no-aparece-existe' 
# Conflicts:
#   pandora_console/extras/mr/68.sql
 2024-02-15 14:55:59 +00:00
alejandro.campos@artica.es 02ab6f289b fixed not registered widget 2024-02-14 18:27:05 +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 731cc195ec fix safe mode recovery 2024-02-12 17:47:46 +01: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 Maya 8524e7ba31 Merge branch 'develop' into ent-12321-widget-mapa-gis 2024-02-08 09:34:32 +01:00
Enrique Martin f00e491738 Fix merge issues 2024-02-05 23:30:35 +01:00
Enrique Martin f7dbd8f3b2 Net scan improvements 2024-02-02 14:41:28 +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 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
Jonathan c6d29ea60e #12435 external link users fix 2023-12-14 16:59:39 +01:00