Commit Graph

37294 Commits

Author SHA1 Message Date
daniel d2b6b098a3 fix inventory pandora_enterprise#12188 2023-11-29 11:38:19 +01:00
alejandro.campos@artica.es 6f96087d90 implement demo data load 2023-11-29 11:30:48 +01:00
Jonathan f86a3e60e8 #11763 save filter regex on bbdd 2023-11-29 11:14:40 +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
Matias Didier 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
Daniel Maya 892048554e #12468 Fixed instructions 2023-11-29 10:27:55 +01:00
Jonathan 824e6b78a0 #12341 module plugin enable disable windows 2023-11-29 10:27:40 +01:00
Enrique Martin 02e8c1b2d5 Fixed quotes in PRD file 2023-11-29 10:19:24 +01:00
miguel angel rasteu 63945df5fd #11495 Add tip and fix MTRS bug 2023-11-29 09:44:25 +01:00
miguel angel rasteu 64b612faea #11494 Add tip and fix MTRS bug 2023-11-29 09:40:34 +01:00
Matias Didier 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
alejandro.campos@artica.es d03691b884 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-11-29 09:01:13 +01:00
alejandro.campos@artica.es 7240bbf934 implement demo data load 2023-11-29 09:00:45 +01:00
miguel angel rasteu d096f3f9ea Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail 2023-11-29 08:44:08 +01:00
artica 8378d7ef91 Auto-updated build strings. 2023-11-29 01:00:30 +01:00
felix.suarez deff8a3bce Change some defaults on pandora_agent.conf 2023-11-28 10:21:15 -06:00
Daniel Cebrian 4d1df2dcc5 #12247 refactored vulnerabilities and hardening 2023-11-28 16:59:04 +01:00
Enrique Martin e56b0ee37e Added all widgets by defult 2023-11-28 16:46:42 +01:00
Enrique Martin 4cf2b3427e Added peridicity to reports prd format 2023-11-28 16:00:01 +01:00
Matias Didier 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
Jorge Rincon faffada931 Merge branch 'develop' into ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo 2023-11-28 15:10:02 +01:00
Jonathan 837f1ff73c Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 13:04:13 +01:00
Enrique Martin 8849e80406 Added demodata PRD files 2023-11-28 12:59:11 +01:00
Jonathan c68bf25886 #12341 agent basic options 2023-11-28 12:52:27 +01:00
Rafael Ameijeiras 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
daniel 5bd689500c move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 11:06:39 +01:00
Alejandro Sánchez 41e2b36b13 Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-3' into 'develop'
re merge mr changes

See merge request artica/pandorafms!6708
2023-11-28 10:04:12 +00:00
Matias Didier 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
alejandro bb7c618528 re merge mr changes 2023-11-28 10:59:04 +01:00
Rafael Ameijeiras 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
Matias Didier 8425e70740 Merge branch 'ent-12387-bug-edicion-item-agent-module-view' into 'develop'
Ent 12387 bug edicion item agent module view

See merge request artica/pandorafms!6622
2023-11-28 09:29:14 +00:00
Daniel Cebrian 4ce47cec8e #12176 control error legacy 2023-11-28 09:56:51 +01:00
Jonathan 49a81b34c4 Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos 2023-11-28 09:50:48 +01:00
Daniel Cebrian e7ebbedabc #12176 formatted error 2023-11-28 09:34:10 +01:00
Jonathan 30fd521cb7 Merge branch 'develop' into ent-12341-agent-basic-options 2023-11-28 09:32:59 +01:00
Matias Didier c532bfc4c7 Merge branch 'ent-11832-Cambiar-artica.es-por-pandorafms.com-en-fichero-pandoradb_data.sql' into 'develop'
Ent 11832 cambiar artica.es por pandorafms.com en fichero pandoradb data.sql

See merge request artica/pandorafms!6433
2023-11-28 08:23:46 +00: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
Matias Didier 44aff84d9e Merge branch 'ent-11699-filtro-paradas-planificadas-con-fondo-blanco-en-black-theme-en-v772lts' into 'develop'
Ent 11699 filtro paradas planificadas con fondo blanco en black theme en v772lts

See merge request artica/pandorafms!6253
2023-11-28 08:22:29 +00:00
Jonathan 6e71cb8b7a Merge branch 'develop' into ent-12387-bug-edicion-item-agent-module-view 2023-11-28 09:03:49 +01:00
daniel 6eefd38f65 move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:49:58 +01:00
daniel f9e7f19771 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql 2023-11-28 08:43:45 +01:00
daniel 730cfb30ff Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
Conflicts:
	pandora_console/include/styles/pandora.css
2023-11-28 08:40:07 +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 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
Jonathan 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
daniel 3f3e8e42bc move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:13:00 +01:00
Matias Didier 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
Matias Didier 3b2c5237d1 Merge branch 'ent-12036-error-en-el-nombre-de-la-copia-de-un-dashboard-cualquiera' into 'develop'
Ent 12036 error en el nombre de la copia de un dashboard cualquiera

See merge request artica/pandorafms!6457
2023-11-28 07:09:11 +00:00
Matias Didier b47b076cf1 Merge branch 'ent-1205-projection-graph-se-inventa-la-grafica-a-veces' into 'develop'
Ent 1205 projection graph se inventa la grafica a veces

See merge request artica/pandorafms!6435
2023-11-28 07:08:36 +00: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