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

5279 Commits

Author SHA1 Message Date
Pablo Aragon ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +02:00
Pablo Aragon 63d3745794 11423-Graph analytics. Get filter data (WIP) 2023-08-16 15:12:31 +02:00
Pablo Aragon a10b526938 11423-Graph analytics. Get filter data (WIP) 2023-08-14 15:36:19 +02:00
Pablo Aragon 5ed9206f36 11423-Graph analytics. Drag&Drop (WIP) 2023-08-11 13:50:32 +02:00
Pablo Aragon 28b8eeca61 11423-Graph analytics (WIP) 2023-08-10 09:13:48 +02:00
Rafael Ameijeiras 3cfa60b38a Merge branch 'ent-11219-fallo-en-traducciones' into 'develop' 
Ent 11219 fallo en traducciones

See merge request artica/pandorafms!6305
 2023-08-04 09:38:01 +00:00
Rafael Ameijeiras 354276fb9e Merge branch 'ent-11822-acoustic-console-no-funciona' into 'develop' 
Ent 11822 acoustic console no funciona

See merge request artica/pandorafms!6309
 2023-08-04 06:42:34 +00:00
Rafael Ameijeiras 0b680568b5 Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' 
Ent 11739 compatibilidad php 8 2 second

See merge request artica/pandorafms!6300
 2023-08-04 06:32:37 +00:00
Jonathan a48c496e14 #11822 fix sound events window 2023-08-03 12:22:35 +02:00
Rafael Ameijeiras fec85ce8e7 Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' 
Ent 11749 15964 conteo de agentes no aparece en v772

See merge request artica/pandorafms!6266
 2023-08-03 07:04:11 +00:00
miguel angel rasteu fddc709aee #11219 Fix transaltes 2023-08-02 14:48:02 +02:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02: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
Daniel Maya 858a6230b3 resolved conflict 2023-07-31 09:02:58 +02: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
miguel angel rasteu 539dd0ddee #10875 Fix title dialog event 2023-07-28 13:07:04 +02:00
miguel angel rasteu b4ae714af3 #10875 Truncate long string 2023-07-28 10:39:46 +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
Pablo Aragon 0eb60cf5c8 11174-Timezone iana graph firefox 2023-07-27 11:24:52 +02:00
miguel angel rasteu 2b20b7f8ee #11386 Fix modal 2023-07-27 10:47:51 +02:00
Daniel Rodriguez c2d7c10442 Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop' 
remove legacy visual console

See merge request artica/pandorafms!6140
 2023-07-26 11:09:44 +00:00
Rafael Ameijeiras 0e6531b983 Merge branch 'ent-11335-se-pueden-crear-mapas-de-red-con-el-mismo-nombre-y-grupo' into 'develop' 
Ent 11335 Se pueden crear mapas de red con el mismo nombre y grupo

See merge request artica/pandorafms!6143
 2023-07-25 07:53:15 +00:00
Rafael Ameijeiras 25e2183d23 Merge branch 'ent-11726-15939-no-hay-columna-nombre-del-agente' into 'develop' 
Ent 11726 15939 no hay columna nombre del agente

See merge request artica/pandorafms!6240
 2023-07-25 07:51:24 +00:00
miguel angel rasteu a1965de2ea #11386 Fix sound alert modal 2023-07-24 12:25:06 +02:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +02:00
miguel angel rasteu 80b60eb86f #11749 Fix agent count 2023-07-20 08:43:51 +02:00
daniel c520375c61 ack utimestamp pandora_enterprise#11387 2023-07-19 13:28:53 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
Daniel Maya 5806da78dd #11487 Fixed subgroups 2023-07-18 10:18:30 +02:00
Diego Muñoz-Reja 92623a5837 Merge branch 'ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2' into 'develop' 
Ent 11573 mejora de los informes en vivo de netflow 2

See merge request artica/pandorafms!6142
 2023-07-18 07:30:00 +00:00
Miguel Angel Rasteu c428a7d69c Merge branch 'develop' into 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' 
# Conflicts:
#   pandora_console/operation/events/events.php
 2023-07-17 08:45:28 +00:00
Rafael Ameijeiras de84f5fae9 Merge branch 'ent-11418-cambiar-vista-de-graficas-del-detalle-de-un-agente' into 'develop' 
Ent 11418 cambiar vista de graficas del detalle de un agente

See merge request artica/pandorafms!6014
 2023-07-17 07:53:10 +00:00
miguel angel rasteu 2af618b765 #11726 Fix alert status column name agent 2023-07-12 14:11:00 +02:00
Diego Muñoz-Reja a7c0866be0 Merge branch 'ent-11293-lista-de-reportes-en-metaconsola' into 'develop' 
Ent 11293 lista de reportes en metaconsola

See merge request artica/pandorafms!5952
 2023-07-12 07:16:35 +00:00
Rafael Ameijeiras a8d8676422 Merge branch 'ent-10976-busqueda-rapida-agentes-pasar-a-datatables' into 'develop' 
Ent 10976 busqueda rapida agentes pasar a datatables

See merge request artica/pandorafms!5834
 2023-07-12 06:04:56 +00:00
Jonathan 183e11a640 #10976 & correction on search agents 2023-07-11 10:24:50 +02:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
Gorka Sanchez 374cad5d8d Merge branch 'ent-11312-15642-problemas-url-publica-de-visual-consoles' into 'develop' 
Ent 11312 15642 problemas url publica de visual consoles

See merge request artica/pandorafms!5963
 2023-07-10 14:12:53 +00:00
Jonathan 27222a1731 #10976 fix minor error 2023-07-10 13:59:33 +02:00
miguel angel rasteu 14819e045e #11649 Fix event widget 2023-07-10 09:04:07 +02:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
Gorka Sanchez cd668590bd Merge branch 'ent-11567-ventana-about' into 'develop' 
Ent 11567 ventana about

See merge request artica/pandorafms!6138
 2023-07-07 07:24:44 +00:00
Jonathan 178f04945f #10976 fix bug search agents global search 2023-07-07 09:21:52 +02:00
miguel angel rasteu 444dbb4599 #11386 Fix modal event sound 2023-07-06 13:15:45 +02:00
Jonathan 82cac02da9 Merge branch 'develop' into ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2 2023-07-06 12:37:16 +02:00
Gorka Sanchez 8fd3ed6650 Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop' 
Ent 9478 creacion y edicion directa de alertas desde metaconsola

See merge request artica/pandorafms!5806
 2023-07-06 09:44:33 +00:00
Daniel Cebrian d993674c12 Merge branch 'develop' into ent-11567-ventana-about 2023-07-06 11:30:45 +02:00
Daniel Cebrian 951a468282 #11418 fixed id modules order in view graphs 2023-07-06 11:26:29 +02:00