8e69326e3c
Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed
2023-12-11 08:43:37 +01:00
725c5d964c
#12620 fixed blacklist items in setup
2023-12-07 13:09:42 +01:00
b99b0d4708
#12606 Fixed period
2023-12-07 12:49:20 +01:00
78bb8e0bae
#8365 ix merge conflict
2023-12-07 10:58:45 +01:00
b1b3cced7d
Merge branch 'ent-11903-16107-borrar-listado-mapas-gis' into 'develop'
...
Ent 11903 16107 borrar listado mapas gis
See merge request artica/pandorafms!6393
2023-12-07 09:27:38 +00:00
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
457f8e9448
some changes in discovery
2023-12-05 16:07:14 +01:00
d601103df3
fix url
2023-12-05 11:49:43 +01:00
433ce7971f
minor change
2023-12-05 11:38:11 +01:00
60137eb300
changes in discovery extensions
2023-12-05 11:32:19 +01:00
1d36d8a436
fix error 500 and warnings pandora_enterprise#12605
2023-12-05 09:14:02 +01:00
77cf0ce6ca
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-05 08:02:55 +01:00
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
75ddb3b934
minor changes in demo data functionality
2023-12-04 11:37:12 +01:00
3952c259d4
Merge branch 'ent-12062-16257-16240-caracteres-extranos-bloquean-modulo-plugin-con-o-sin-politica' into 'develop'
...
Ent 12062 16257 16240 caracteres extranos bloquean modulo plugin con o sin politica
See merge request artica/pandorafms!6545
2023-12-04 09:22:13 +00:00
38672764a3
Merge branch 'ent-12341-agent-basic-options' into 'develop'
...
Ent 12341 agent basic options
See merge request artica/pandorafms!6681
2023-12-04 08:12:23 +00:00
55aee67df3
Added GIS maps creation
2023-12-03 23:23:57 +01:00
fd48d6eba6
Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica
2023-12-01 11:16:56 +01:00
0ed2a6f946
Merge branch 'ent-12516-cambio-de-modelo-en-actualizaciones-solo-LTS-por-defecto-mostrar-informacion-sobre-versiones-en-warp-update' into 'develop'
...
Ent 12516 cambio de modelo en actualizaciones solo lts por defecto mostrar informacion sobre versiones en warp update
See merge request artica/pandorafms!6715
2023-12-01 09:27:45 +00:00
d8063fd008
Merge branch 'ent-11652-en-detalles-de-alertas-el-contenido-no-se-adapta-al-espacio-adicional-disponible-al-colapsar' into 'develop'
...
Ent 11652 en detalles de alertas el contenido no se adapta al espacio adicional disponible al colapsar
See merge request artica/pandorafms!6397
2023-12-01 09:23:23 +00:00
ec8d16e49b
#11652 Resolve conflicts
2023-12-01 10:07:41 +01:00
0ef4685569
#12123 Resolve conflicts
2023-12-01 09:35:50 +01:00
6edc90ec87
#12516 The modal is added to the online updates view.
...
lts_updates token is added to pandoradb_data.sql
2023-11-30 15:59:57 +01:00
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
ee6717aa06
#12341 limit invnetory on windows basic options
2023-11-30 12:53:59 +01:00
607d7e36e5
#12341 enable invetory .vbs
2023-11-30 12:11:12 +01:00
c41b360a6e
#8365 merge conflict
2023-11-30 12:04:28 +01:00
313407dcc5
Merge branch 'develop' into ent-12516-cambio-de-modelo-en-actualizaciones-solo-LTS-por-defecto-mostrar-informacion-sobre-versiones-en-warp-update
2023-11-30 11:53:35 +01:00
f9fd33fa2e
#12516 Fixed set token configuration lts updates
2023-11-30 11:50:19 +01:00
f600648cc0
#12341 fix agent_version
2023-11-30 11:43:54 +01:00
c60c75475b
Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop'
...
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro
See merge request artica/pandorafms!6523
2023-11-30 09:23:16 +00:00
bac9d4b7a6
#12341 agent version when string have build
2023-11-30 09:38:12 +01:00
ac4b45646d
#12516 Modal update lts added
2023-11-30 09:30:50 +01:00
1fc2c432e5
Merge branch 'develop' into ent-12341-agent-basic-options
2023-11-30 09:14:35 +01:00
b99c9240de
#8365 NCM Merge conflict
2023-11-30 08:32:15 +01:00
75d57337af
#11705 Fix merge conflict
2023-11-30 08:10:32 +01:00
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
a290203847
implement demo data load
2023-11-29 16:57:38 +01:00
db89c72be5
fix error empty clusters pandora_enterprise#12511
2023-11-29 16:00:46 +01:00
38a79fa6a6
#12516 fixed modal body padding
2023-11-29 15:30:41 +01:00
33ca5ab4ab
Merge branch 'ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer' into 'develop'
...
Ent 12424 aviso en thresholds de tipo percentage que no deberia aparecer
See merge request artica/pandorafms!6651
2023-11-29 14:23:32 +00:00
df76a5194c
#12561 information for LTS versions in Warp Update
2023-11-29 13:40:38 +01:00
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
9511d82692
Merge branch 'ent-11714-15928-pantalla-personalizada-del-usuario-error-al-establecer-link-externo-como-homescreen' into 'develop'
...
Ent 11714 15928 pantalla personalizada del usuario error al establecer link externo como homescreen
See merge request artica/pandorafms!6250
2023-11-29 09:29:43 +00:00
824e6b78a0
#12341 module plugin enable disable windows
2023-11-29 10:27:40 +01:00
22969eff6e
Merge branch 'ent-11074-para-el-listado-de-plugin-registrados-falta-enlace-web-desde-nodo-registrado-hacia-metaconsola' into 'develop'
...
Ent 11074 para el listado de plugin registrados falta enlace web desde nodo registrado hacia metaconsola
See merge request artica/pandorafms!6482
2023-11-29 08:09:54 +00:00
7240bbf934
implement demo data load
2023-11-29 09:00:45 +01:00
447e788ab3
Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop'
...
Ent 12260 cuando haces el cambio de grupo en un agente el icono se queda petado
See merge request artica/pandorafms!6587
2023-11-28 14:14:26 +00:00
837f1ff73c
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 13:04:13 +01:00
c68bf25886
#12341 agent basic options
2023-11-28 12:52:27 +01:00
8b6a4733cf
Merge branch 'ent-12253-informe-de-vulnerabilidades' into 'develop'
...
Ent 12253 Informe de vulnerabilidades
See merge request artica/pandorafms!6686
2023-11-28 11:14:48 +00:00
5bd689500c
move extension translate_string and file_repo pandora_enterprise#12333
2023-11-28 11:06:39 +01:00
c8daeda489
Merge branch 'ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor' into 'develop'
...
Ent 12372 error visual al acceder configuracion avanzada remota del servidor
See merge request artica/pandorafms!6662
2023-11-28 10:01:01 +00:00
e5237aafe1
Merge branch 'ent-12517-cambiar-nombre-al-token-allow-all-ips' into 'develop'
...
Ent 12517 Cambiar nombre al token "Allow all IPs"
See merge request artica/pandorafms!6696
2023-11-28 09:58:44 +00:00
4ce47cec8e
#12176 control error legacy
2023-11-28 09:56:51 +01:00
e7ebbedabc
#12176 formatted error
2023-11-28 09:34:10 +01:00
30fd521cb7
Merge branch 'develop' into ent-12341-agent-basic-options
2023-11-28 09:32:59 +01:00
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
f9e7f19771
Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql
2023-11-28 08:43:45 +01:00
9819c3a5ff
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
2023-11-28 08:30:23 +01:00
f6f0f15731
Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
pandora_console/include/graphs/fgraph.php
pandora_console/include/lib/Dashboard/Widgets/single_graph.php
pandora_console/include/styles/pandora.css
2023-11-28 08:29:10 +01:00
2dec31485a
Merge branch 'develop' into ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer
2023-11-28 08:19:53 +01:00
3f3e8e42bc
move extension translate_string and file_repo pandora_enterprise#12333
2023-11-28 08:13:00 +01:00
4dc84d58e3
Merge branch 'ent-12023-en-create-custom-report-al-seleccionar-write-access-no-aparece-lista-de-grupo' into 'develop'
...
Ent 12023 en create custom report al seleccionar write access no aparece lista de grupo
See merge request artica/pandorafms!6460
2023-11-28 07:12:51 +00:00
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
def169abb8
Merge branch 'develop' into ent-8365-ncm-fase-3
2023-11-28 07:58:50 +01:00
dde1146ccb
#fixed delete allow ip when edit user
2023-11-27 17:54:05 +01:00
c7fcf7c168
Merge branch 'ent-11815-Modificar-creacion-de-modulos-predictivos-en-politicas-e-individualmente' into 'develop'
...
changed behavior of prediction modules creation
See merge request artica/pandorafms!6540
2023-11-27 16:01:57 +00:00
ead68be05a
Merge branch 'develop' into ent-12517-cambiar-nombre-al-token-allow-all-ips
2023-11-27 16:59:29 +01:00
139d884525
#12517 fixed permission
2023-11-27 16:59:21 +01:00
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
964321d1bd
Merge branch 'ent-12091-filtrado-de-agentes-modulos-en-operaciones-masivas-de-alertas' into 'develop'
...
Ent 12091 filtrado de agentes modulos en operaciones masivas de alertas
See merge request artica/pandorafms!6516
2023-11-27 14:50:39 +00:00
41e1593afb
Merge branch 'ent-11759-15977-cambios-en-la-eliminacion-de-acciones-en-las-alertas-snmp' into 'develop'
...
Ent 11759 15977 cambios en la eliminacion de acciones en las alertas snmp
See merge request artica/pandorafms!6387
2023-11-27 14:49:08 +00:00
5825a95eae
Merge branch 'ent-11855-bug-custom-graphs-el-icono-graph-container-desaparece' into 'develop'
...
Ent 11855 bug custom graphs el icono graph container desaparece
See merge request artica/pandorafms!6428
2023-11-27 14:47:55 +00:00
6b385ca260
Merge branch 'develop' into ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor
2023-11-27 15:45:14 +01:00
8e68198ab5
Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop'
...
Ent 11679 15855 nombres de modulos no tienen link a su edicion
See merge request artica/pandorafms!6422
2023-11-27 14:39:14 +00:00
2fa8ed3c9e
Merge branch 'ent-12219-error-al-eliminar-perfiles-en-edicion-de-usuario' into 'develop'
...
Ent 12219 error al eliminar perfiles en edicion de usuario
See merge request artica/pandorafms!6555
2023-11-27 14:38:14 +00:00
707f85ed7f
Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop'
...
Ent 11511 cambiar el apartado de tools a seccion management
See merge request artica/pandorafms!6403
2023-11-27 14:36:38 +00:00
afa6a7d415
#12517 allow ip limited to user admin
2023-11-27 13:55:08 +01:00
27d78ef049
Merge branch 'develop' into ent-12253-informe-de-vulnerabilidades
2023-11-27 13:29:05 +01:00
7cd163b01e
#12253 new reports
2023-11-27 13:25:52 +01:00
d544ef4ac5
Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop'
...
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola
See merge request artica/pandorafms!6539
2023-11-27 12:24:22 +00:00
4e37f309b4
Merge branch 'ent-10807-mejorar-vista-gis-map-builder' into 'develop'
...
Ent 10807 mejorar vista gis map builder
See merge request artica/pandorafms!6552
2023-11-27 12:24:17 +00:00
7bc998d230
Merge branch 'ent-12206-limitacion-cambio-de-contrasena-de-usuarios' into 'develop'
...
Ent 12206 limitacion cambio de contrasena de usuarios
See merge request artica/pandorafms!6542
2023-11-27 12:12:10 +00:00
167be52f5f
#11714 Resolve conflict
2023-11-27 13:11:38 +01:00
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
8865f0394e
Merge branch 'ent-12218-bug-del-boton-show-hide-password-de-usuarios' into 'develop'
...
Ent 12218 bug del boton show hide password de usuarios
See merge request artica/pandorafms!6553
2023-11-27 12:00:28 +00:00
6992562178
Merge branch 'ent-12126-al-crear-una-nueva-plantilla-de-alerta-aparece-una-opcion-en-cero-literalmente-en-campo' into 'develop'
...
Ent 12126 al crear una nueva plantilla de alerta aparece una opcion en cero literalmente en campo
See merge request artica/pandorafms!6500
2023-11-27 11:58:30 +00:00
9a172b3f84
Merge branch 'ent-11898-16094-bug-paginacion-en-custom-fields' into 'develop'
...
Ent 11898 16094 bug paginacion en custom fields
See merge request artica/pandorafms!6379
2023-11-27 11:57:53 +00:00
c3af86414f
Merge branch 'ent-11650-aviso-emergente-no-acorde-con-la-nueva-interfaz' into 'develop'
...
Ent 11650 aviso emergente no acorde con la nueva interfaz
See merge request artica/pandorafms!6395
2023-11-27 11:56:57 +00:00
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
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
b0125d943e
#12138 Resolve conflict
2023-11-27 11:51:00 +01:00
a4cd6d7fe1
#12138 Resolve conflict
2023-11-27 11:43:24 +01:00
b58714d769
Merge branch 'ent-11951-anadir-nombre-de-servidor-en-la-lista-de-servidores' into 'develop'
...
Added name and master server column to servers view
See merge request artica/pandorafms!6613
2023-11-27 10:41:03 +00:00
6f4d519b32
Merge branch 'ent-12417-grafica-de-umbrales-numericos-en-modulos-alfanumericos' into 'develop'
...
Ent 12417 grafica de umbrales numericos en modulos alfanumericos
See merge request artica/pandorafms!6646
2023-11-27 10:35:53 +00:00
e5df1a5285
Merge branch 'ent-12122-CVE-2023-44088-SQL-Injection-en-Consola-Visual' into 'develop'
...
Ent 12122 cve 2023 44088 sql injection en consola visual
See merge request artica/pandorafms!6525
2023-11-27 10:26:30 +00:00
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
c321165252
Merge branch 'ent-12298-error-en-almacenamiento-de-datos-de-acciones-de-alerta' into 'develop'
...
Ent 12298 error en almacenamiento de datos de acciones de alerta
See merge request artica/pandorafms!6597
2023-11-27 10:23:58 +00:00
3d3cbd5e96
9753 Fixed group list
2023-11-27 09:39:56 +01:00
miguel angel rasteu
Jorge Rincon
Daniel Maya
Jonathan
Diego Muñoz-Reja
Alejandro Campos
daniel
Rafael Ameijeiras
Enrique Martin
Calvo
Matias Didier
Daniel Rodriguez
Daniel Cebrian