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

34802 Commits

Author SHA1 Message Date
Jonathan 1c7e7e8ee1 #11162 new service icon 2023-07-03 15:12:47 +02:00
Jonathan 8f227233fd #9478 fix delete mesage and permisions 2023-07-03 14:56:39 +02:00
Matias Didier b3d098794d Merge branch 'ent-10660-update-journal-usar-las-opciones-de-visual-styles' into 'develop' 
Ent 10660 update journal usar las opciones de visual styles

See merge request artica/pandorafms!5798
 2023-07-03 11:50:06 +00:00
Gorka Sanchez a8f4ebb7e3 Merge branch 'ent-11663-corregir-rutas-personalizadas-para-la-separacion-de-procesos-en-el-script-de-inicio-de-pandora' into 'develop' 
11663 use variable instead of path for multiple instance check conf exepction

See merge request artica/pandorafms!6181
 2023-07-03 10:20:40 +00:00
Jonathan 11bc45ff02 #11625 fix style event type icon 2023-07-03 12:13:27 +02:00
Jonathan 47f54edd64 Merge branch 'develop' into ent-11626-la-visualizacion-del-detalle-de-una-alerta-no-muestra-bien-las-acciones 2023-07-03 11:59:56 +02:00
Matias Didier daec53aac1 Merge branch 'ent-11191-no-funciona-la-opcion-de-agregar-usuarios-a-las-notificaciones' into 'develop' 
Ent 11191 no funciona la opcion de agregar usuarios a las notificaciones

See merge request artica/pandorafms!5901
 2023-07-03 09:30:57 +00:00
Gorka Sanchez 7170dc5d1e Merge branch 'ent-11670-15842-problemas-con-idioma-en-espanol-y-la-seleccion-la-pagina-de-incicio' into 'develop' 
Ent 11670 15842 problemas con idioma en espanol y la seleccion la pagina de incicio

See merge request artica/pandorafms!6189
 2023-07-03 09:14:01 +00:00
Matias Didier 9ecaf13473 Merge branch 'ent-10563-mejoras-personalizacion-interfaz' into 'develop' 
#10563 Fix config enable feedback

See merge request artica/pandorafms!6203
 2023-07-03 08:47:55 +00:00
miguel angel rasteu 8ad4e8261e #10563 Fix config enable feedback 2023-07-03 10:22:22 +02:00
Jonathan 1c69208a6a Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola 2023-07-03 10:21:55 +02:00
Jonathan d7a682d48c Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-03 09:50:59 +02:00
Gorka Sanchez d7a871ff76 Merge branch 'ent-10563-mejoras-personalizacion-interfaz' into 'develop' 
Ent 10563 mejoras personalizacion interfaz

See merge request artica/pandorafms!6200
 2023-07-03 07:49:25 +00:00
Gorka Sanchez 5e65dfa639 Merge branch 'ent-11474-inventario-all-no-se-muestra-en-metaconsola' into 'develop' 
Ent 11474 inventario all no se muestra en metaconsola

See merge request artica/pandorafms!6055
 2023-07-03 07:48:35 +00:00
Miguel Angel Rasteu 82f6c6c0da Merge branch 'develop' into 'ent-10563-mejoras-personalizacion-interfaz' 
# Conflicts:
#   pandora_console/godmode/agentes/module_manager.php
 2023-07-03 07:45:32 +00:00
Miguel Angel Rasteu 6a161a1af8 Merge branch 'develop' into 'ent-11474-inventario-all-no-se-muestra-en-metaconsola' 
# Conflicts:
#   pandora_console/include/functions_inventory.php
 2023-07-03 07:44:19 +00:00
Gorka Sanchez ffc4f04989 Merge branch 'ent-11628-no-carga-el-total-amount-of-events-correctamente-si-hay-varios-widget-tactical-view' into 'develop' 
Ent 11628 no carga el total amount of events correctamente si hay varios widget tactical view

See merge request artica/pandorafms!6154
 2023-07-03 07:42:21 +00:00
Gorka Sanchez 7be57b2b22 Merge branch 'ent-11231-15600-filtrar-por-grupo-padre-no-muestra-resultados-en-remote-components' into 'develop' 
Ent 11231 15600 filtrar por grupo padre no muestra resultados en remote components

See merge request artica/pandorafms!5915
 2023-07-03 07:41:18 +00:00
Gorka Sanchez 8e5e2e966b Merge branch 'ent-11370-version-de-snmp-walk-mal-representada-visualmente-en-el-desplegable-de-seleccion' into 'develop' 
Ent 11370 version de snmp walk mal representada visualmente en el desplegable de seleccion

See merge request artica/pandorafms!5974
 2023-07-03 07:40:37 +00:00
Gorka Sanchez b84525f74f Merge branch 'ent-11267-15611-intervalo-inverso-no-funciona-en-la-creacion-de-modulos-a-traves-de-componentes-de-red' into 'develop' 
Ent 11267 15611 intervalo inverso no funciona en la creacion de modulos a traves de componentes de red

See merge request artica/pandorafms!5961
 2023-07-03 07:40:10 +00:00
Gorka Sanchez 64edf8bb66 Merge branch 'ent-11287-nombres-de-acciones-de-modulos-en-vista-de-agente-al-hacer-hover' into 'develop' 
Ent 11287 nombres de acciones de modulos en vista de agente al hacer hover

See merge request artica/pandorafms!5950
 2023-07-03 07:39:23 +00:00
Gorka Sanchez 029cb77068 Merge branch 'ent-11460-top-n-events-by-agent-y-by-module-en-metaconsola-no-toman-en-cuenta-los-top-n-de-los-nodos' into 'develop' 
Ent 11460 top n events by agent y by module en metaconsola no toman en cuenta los top n de los nodos

See merge request artica/pandorafms!6036
 2023-07-03 07:37:28 +00:00
Jonathan 5f8c2f1653 #11628 merge conflict solution 2023-07-03 09:34:04 +02:00
Gorka Sanchez 498a6d1ee6 Merge branch 'ent-11465-widget-agent-module-view-se-rompe-si-aloja-modulo-no-inicializado-que-posteriormente-reporta' into 'develop' 
Ent 11465 widget agent module view se rompe si aloja modulo no inicializado que posteriormente reporta

See merge request artica/pandorafms!6030
 2023-07-03 07:33:54 +00:00
Gorka Sanchez 6a8a0e8b6f Merge branch 'ent-11469-selector-de-modulos-comunes-en-wizard-de-servicios-no-anade-nada' into 'develop' 
Ent 11469 selector de modulos comunes en wizard de servicios no anade nada

See merge request artica/pandorafms!6047
 2023-07-03 07:33:05 +00:00
Gorka Sanchez 51de155193 Merge branch 'ent-11676-GUARDIA-15840-Errores-SQL-al-actualizar-con-el-online' into 'develop' 
minor fix

See merge request artica/pandorafms!6187
 2023-07-03 07:26:01 +00:00
artica 74c4b28fc5 Auto-updated build strings. 2023-07-03 01:00:41 +02:00
artica 1d3f1b38fa Auto-updated build strings. 2023-07-02 01:00:46 +02:00
artica a2faf2cd58 Auto-updated build strings. 2023-07-01 01:02:08 +02:00
Jorge Rincon 996f54ac30 #11684 Fixed automatic login functionality with loginhash 2023-06-30 14:06:46 +02:00
Gorka Sanchez b072a8970e Merge branch 'ent-11671-tactical-view-numeros-de-los-modulos-no-tienen-el-color-de-su-estado' into 'develop' 
Ent 11671 tactical view numeros de los modulos no tienen el color de su estado

See merge request artica/pandorafms!6193
 2023-06-30 11:44:53 +00:00
Gorka Sanchez aa7186512c Merge branch 'ent-9610-filtrar-por-os-en-bulk-operations' into 'develop' 
Ent 9610 filtrar por os en bulk operations

See merge request artica/pandorafms!5863
 2023-06-30 11:43:50 +00:00
Gorka Sanchez 5e31ca7c65 Merge branch 'ent-10860-problema-con-borrado-de-modulos-hijos-nietos-etc' into 'develop' 
Ent 10860 problema con borrado de modulos hijos nietos etc

See merge request artica/pandorafms!5815
 2023-06-30 11:42:51 +00:00
Gorka Sanchez 28f99d2c27 Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop' 
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres

See merge request artica/pandorafms!5713
 2023-06-30 11:39:50 +00:00
Gorka Sanchez fe81f0f2f9 Merge branch 'ent-10304-14986-configuracion-masiva-de-la-accion-de-alerta-en-la-politica' into 'develop' 
Ent 10304 14986 configuracion masiva de la accion de alerta en la politica

See merge request artica/pandorafms!6195
 2023-06-30 11:38:37 +00:00
Matias Didier 0e0dd311e7 Merge branch 'ent-11379-15676-reinicio-de-filtro-os-desde-administracion-de-agentes-al-realziar-una-accion-sobre-el' into 'develop' 
Ent 11379 15676 reinicio de filtro os desde administracion de agentes al realziar una accion sobre el

See merge request artica/pandorafms!5983
 2023-06-30 10:42:02 +00:00
Rafael Ameijeiras 83f3928495 Merge branch 'ent-11657-error-sql-al-seleccionar-varios-agentes-en-item-de-inventario-informe-metaconsola' into 'develop' 
Ent 11657 error sql al seleccionar varios agentes en item de inventario informe metaconsola

See merge request artica/pandorafms!6175
 2023-06-30 07:07:35 +00:00
Rafael Ameijeiras b44bd8efca Merge branch 'ent-10691-mejoras-en-widget-top-n-agent-modules' into 'develop' 
Ent 10691 mejoras en widget top n agent modules

See merge request artica/pandorafms!5853
 2023-06-30 07:06:46 +00:00
Rafael Ameijeiras 2092cfed71 Merge branch 'ent-11648-envio-de-correos-falla-si-se-tiene-la-encriptacion-de-contrasenas-habilitadas-en-771-772' into 'develop' 
Draft: Ent 11648 Envío de correos falla si se tiene la encriptación de contraseñas habilitadas en 771-772.

See merge request artica/pandorafms!6177
 2023-06-30 07:05:44 +00:00
Rafael Ameijeiras 59e5bbbf87 Merge branch 'ent-11662-Errores-en-el-menu-componentes-remotos-locales' into 'develop' 
some fixes

See merge request artica/pandorafms!6180
 2023-06-30 07:03:31 +00:00
miguel angel rasteu ac92b5979c #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-06-30 08:35:37 +02:00
artica 3569cc53a4 Auto-updated build strings. 2023-06-30 01:00:59 +02:00
Matias Didier 3b6391102e Merge branch 'ent-9781-14477-Control-reportes-SQL-Query-en-PDF' into 'develop' 
Ent 9781 14477 control reportes sql query en pdf

See merge request artica/pandorafms!5820
 2023-06-29 12:49:52 +00:00
Matias Didier ddbeb008b9 Merge branch 'ent-9267-giss-12115-anadir-ruta-completa-en-nombre-de-servicio-en-consola-visual' into 'develop' 
Ent 9267 giss 12115 anadir ruta completa en nombre de servicio en consola visual

See merge request artica/pandorafms!5821
 2023-06-29 11:55:51 +00:00
miguel angel rasteu 61ab82d808 #10304 Fix action default in agent detail 2023-06-29 12:59:32 +02:00
alejandro.campos@artica.es ab2803eb22 fix 2023-06-29 12:42:00 +02:00
alejandro.campos@artica.es 087c0c18cc Merge remote-tracking branch 'origin/develop' into ent-9781-14477-Control-reportes-SQL-Query-en-PDF 2023-06-29 12:00:44 +02:00
Rafael Ameijeiras d082687c44 Merge branch 'ent-10020-Eliminar-login-hash-de-vistas-metaconsola' into 'develop' 
Ent 10020 eliminar login hash de vistas metaconsola

See merge request artica/pandorafms!5839
 2023-06-29 09:55:53 +00:00
Rafael Ameijeiras 9e6595be18 Merge branch 'ent-9867-ips-custom-no-actualizan-al-cambiarlas-en-politica' into 'develop' 
Ent 9867 ips custom no actualizan al cambiarlas en politica

See merge request artica/pandorafms!5802
 2023-06-29 09:52:09 +00:00
Rafael Ameijeiras 3c87f090d5 Merge branch 'ent-9928-Entrecomillar-campos-en-exportacion-CSV-para-la-vista-de-eventos' into 'develop' 
wrap csv fields with string delimiter on export

See merge request artica/pandorafms!5854
 2023-06-29 09:49:29 +00:00