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

35399 Commits

Author SHA1 Message Date
Rafael Ameijeiras ece276e724 Merge branch 'ent-11571-contact-details' into 'develop' 
Ent 11571 contact details

See merge request artica/pandorafms!6161
 2023-08-01 09:32:46 +00:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
Jonathan 84df4e1195 #11571 fix for firefox margin api token span 2023-08-01 11:11:24 +02:00
Jonathan 629f43c8f5 Merge branch 'develop' into ent-11571-contact-details 2023-08-01 10:27:40 +02:00
Rafael Ameijeiras 9f36729d30 Merge branch 'ent-11771-15990-configuracion-de-modulos-de-plugin-en-politicas-en-metaconsola-se-muestran-vacias' into 'develop' 
Ent 11771 15990 configuracion de modulos de plugin en politicas en metaconsola se muestran vacias

See merge request artica/pandorafms!6291
 2023-08-01 07:28:27 +00:00
artica dcb9f89b5d Auto-updated build strings. 2023-08-01 01:00:44 +02:00
Jorge Rincon e7c2340e72 #11771 Fixed plugin field operation in module creation/edition 2023-07-31 15:30:39 +02:00
Rafael Ameijeiras f65a4ddca9 Merge branch 'ent-11755-netflow-live-view-tipo-summary-no-muestra-grafica-al-usar-aggregated-by-ports' into 'develop' 
Ent 11755 netflow live view tipo summary no muestra grafica al usar aggregated by ports

See merge request artica/pandorafms!6279
 2023-07-31 13:11:34 +00:00
Rafael Ameijeiras 75b311ad97 Merge branch 'ent-11768-texto-del-modal-de-save-filter-se-muestra-mal' into 'develop' 
Ent 11768 texto del modal de save filter se muestra mal

See merge request artica/pandorafms!6287
 2023-07-31 13:10:53 +00:00
Rafael Ameijeiras 02bf721e39 Merge branch 'ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv' into 'develop' 
Ent 11751 15966 metaconsola no se exportan los eventos a csv

See merge request artica/pandorafms!6269
 2023-07-31 13:04:24 +00:00
Rafael Ameijeiras 0c4331f9d4 Merge branch 'ent-11351-15668-snmp-alerts-crea-alerta-sin-tener-ningun-dato-puesto-en-formulario' into 'develop' 
Ent 11351 15668 snmp alerts crea alerta sin tener ningun dato puesto en formulario

See merge request artica/pandorafms!5988
 2023-07-31 11:08:29 +00:00
Rafael Ameijeiras 68b2fbd616 Merge branch 'ent-11467-bug-en-vista-tree-view' into 'develop' 
Ent 11467 bug en vista tree view

See merge request artica/pandorafms!6276
 2023-07-31 10:12:33 +00:00
miguel angel rasteu ded7bb1017 #11751 Fix reset 2023-07-31 11:49:29 +02:00
miguel angel rasteu 63923e3599 Merge branch 'develop' into ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv 2023-07-31 11:28:59 +02:00
miguel angel rasteu 1937c3fa00 #11713 Fix style 2023-07-31 10:06:12 +02:00
Rafael Ameijeiras 538f8363bc Merge branch 'ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id' into 'develop' 
change events user_comment new table tevent_comment pandora_enterprise#11387

See merge request artica/pandorafms!6223
 2023-07-31 07:51:57 +00:00
Daniel Maya ad24712eed resolved conflict 2 2023-07-31 09:48:42 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
Rafael Ameijeiras c26d721ecb Merge branch 'ent-11386-post-alertas-sonoras-integradas-en-consola-y-metaconsola' into 'develop' 
Ent 11386 post alertas sonoras integradas en consola y metaconsola

See merge request artica/pandorafms!6217
 2023-07-31 07:30:15 +00:00
miguel angel rasteu 9781809b22 #11713 Fix title 2023-07-31 09:27:50 +02:00
miguel angel rasteu 95e17b46bf Merge branch 'develop' into ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola 2023-07-31 09:03:03 +02:00
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02:00
Jorge Rincon 2fb9634c4b #11772 Fixed netflow server image 2023-07-31 09:02:46 +02:00
Rafael Ameijeiras 3a9404ad12 Merge branch 'ent-11653-cascade-protection-modules-solamente-se-debe-permitir-habilitar-si-se-tiene-un-agente-padre' into 'develop' 
Ent 11653 cascade protection modules solamente se debe permitir habilitar si se tiene un agente padre

See merge request artica/pandorafms!6262
 2023-07-31 06:57:32 +00:00
Rafael Ameijeiras 6db5b41633 Merge branch 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' into 'develop' 
Ent 10875 15383 limitar ancho y o largo de la linea de los eventos

See merge request artica/pandorafms!6034
 2023-07-31 06:40:38 +00:00
artica 3dae79d593 Auto-updated build strings. 2023-07-31 01:00:25 +02:00
artica c52539ebdc Auto-updated build strings. 2023-07-30 01:00:35 +02:00
artica 0682574cc8 Auto-updated build strings. 2023-07-29 01:00:52 +02:00
Jorge Rincon 89f604a602 #11771 Fixed plugin type fields 2023-07-28 14:03:24 +02:00
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +02:00
miguel angel rasteu 539dd0ddee #10875 Fix title dialog event 2023-07-28 13:07:04 +02:00
alejandro.campos@artica.es 75219fb465 keep user id 2023-07-28 12:31:20 +02:00
miguel angel rasteu 014d32181c #10875 Fix title 2023-07-28 12:12:14 +02:00
miguel angel rasteu b4ae714af3 #10875 Truncate long string 2023-07-28 10:39:46 +02:00
Rafael Ameijeiras 319a4e1743 Merge branch 'ent-10478-problemas-con-repositorio-pandora-fms-y-agente-unix-linux' into 'develop' 
Added agent binary RPM spec

See merge request artica/pandorafms!6282
 2023-07-28 07:05:13 +00:00
Rafael Ameijeiras f7df38a0c4 Merge branch 'ent-11174-graficas-descolocadas-en-diagnostic-info' into 'develop' 
Ent 11174 graficas descolocadas en diagnostic info

See merge request artica/pandorafms!6147
 2023-07-28 05:14:18 +00:00
artica 5692f69ed4 Auto-updated build strings. 2023-07-28 01:00:46 +02:00
alejandro.campos@artica.es cf26f4c32a fix inherit ack timestamp feature 2023-07-27 15:11:15 +02:00
Daniel Rodriguez 42a5fc0716 Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop' 
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados

See merge request artica/pandorafms!6051
 2023-07-27 13:08:05 +00:00
alejandro.campos@artica.es 8029125929 fix inherit ack timestamp feature 2023-07-27 15:04:22 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
alejandro.campos@artica.es d7ad90dabf fixed api call 2023-07-27 12:58:57 +02:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' 
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
 2023-07-27 10:27:55 +00:00
Pablo Aragon 0eb60cf5c8 11174-Timezone iana graph firefox 2023-07-27 11:24:52 +02:00
Rafael Ameijeiras 9ce383d2ec Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop' 
Ent 11739 compatibilidad php 8 2

See merge request artica/pandorafms!6286
 2023-07-27 09:17:24 +00:00
Jorge Rincon 03feeebbdf #11768 Fixed the style of the checkbox in the modal save filter 2023-07-27 11:09:24 +02:00
miguel angel rasteu 2b20b7f8ee #11386 Fix modal 2023-07-27 10:47:51 +02:00
Pablo Aragon 5dbf61b424 11174-Timezone iana graph firefox 2023-07-27 09:46:29 +02:00
Daniel Rodriguez 0c6877e7d2 Merge branch 'ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery' into 'develop' 
Ent 9771 discovery 2 0 sistema de extensiones disco para el discovery

See merge request artica/pandorafms!5603
 2023-07-27 07:24:09 +00:00
Pablo Aragon b45a563308 Merge branch 'develop' into ent-11174-graficas-descolocadas-en-diagnostic-info 2023-07-27 08:44:06 +02:00