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

37376 Commits

Author SHA1 Message Date
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
Matias Didier 64cb2ad912 Merge branch 'ent-11911-welcome-dialog-no-detecta-bien-el-correo-configurado' into 'develop' 
Ent 11911 welcome dialog no detecta bien el correo configurado

See merge request artica/pandorafms!6440
 2023-11-28 07:07:26 +00:00
Jonathan def169abb8 Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 07:58:50 +01:00
artica 8bb4758439 Auto-updated build strings. 2023-11-28 01:00:28 +01:00
Daniel Cebrian dde1146ccb #fixed delete allow ip when edit user 2023-11-27 17:54:05 +01:00
Diego Muñoz-Reja de370ff05c Merge branch 'ent-12117-Comprobar-archivos-antes-de-actualizar-oum' into 'develop' 
oum install checks

See merge request artica/pandorafms!6584
 2023-11-27 16:48:31 +00:00
Daniel Rodriguez 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
Daniel Cebrian ead68be05a Merge branch 'develop' into ent-12517-cambiar-nombre-al-token-allow-all-ips 2023-11-27 16:59:29 +01:00
Daniel Cebrian 139d884525 #12517 fixed permission 2023-11-27 16:59:21 +01:00
Jorge Rincon 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
Rafael Ameijeiras 215c665a9c Merge branch 'ent-12173-nombres-de-modulos-en-vista-de-eventos-se-muestran-de-manera-incorrecta' into 'develop' 
Ent 12173 nombres de modulos en vista de eventos se muestran de manera incorrecta

See merge request artica/pandorafms!6565
 2023-11-27 14:51:48 +00:00
Rafael Ameijeiras 4ac9316391 Merge branch 'ent-12079-no-se-aplican-los-filtros-por-defecto-al-hacer-clic-en-el-numero-de-alertas' into 'develop' 
Ent 12079 no se aplican los filtros por defecto al hacer clic en el numero de alertas

See merge request artica/pandorafms!6475
 2023-11-27 14:51:02 +00:00
Rafael Ameijeiras 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
Rafael Ameijeiras 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
Rafael Ameijeiras 728b9d7e7f Merge branch 'ent-12157-sistema-de-notificaciones-muestra-mensaje-sin-texto-alguno' into 'develop' 
Ent 12157 sistema de notificaciones muestra mensaje sin texto alguno

See merge request artica/pandorafms!6561
 2023-11-27 14:48:49 +00:00
Rafael Ameijeiras e3153166c1 Merge branch 'ent-11856-view-events-ubicacion-erronea-para-el-tip-del-token-search-in-secondary-groups' into 'develop' 
Ent 11856 view events ubicacion erronea para el tip del token search in secondary groups

See merge request artica/pandorafms!6388
 2023-11-27 14:48:24 +00:00
Rafael Ameijeiras 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
Rafael Ameijeiras 67700a1ea2 Merge branch 'ent-12083-open-inventory-widget-no-carga' into 'develop' 
Ent 12083 open inventory widget no carga

See merge request artica/pandorafms!6506
 2023-11-27 14:46:47 +00:00
Jorge Rincon 6b385ca260 Merge branch 'develop' into ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor 2023-11-27 15:45:14 +01:00
Rafael Ameijeiras 6e46875721 Merge branch 'ent-12208-desplegable-styles-de-widget-panel-with-a-message' into 'develop' 
Ent 12208 desplegable styles de widget panel with a message

See merge request artica/pandorafms!6549
 2023-11-27 14:39:38 +00:00
Rafael Ameijeiras 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
Rafael Ameijeiras 25152e27f8 Merge branch 'ent-12082-error-al-copiar-widget-de-inventario' into 'develop' 
Ent 12082 error al copiar widget de inventario

See merge request artica/pandorafms!6503
 2023-11-27 14:38:33 +00:00