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

5305 Commits

Author SHA1 Message Date
Gorka Sanchez 66eaf39645 Merge branch 'ent-10637-mejora-informe-grupo' into 'develop' 
Ent 10637 mejora informe grupo

See merge request artica/pandorafms!6206
 2023-08-31 06:47:57 +00:00
Gorka Sanchez d2b768c8cf Merge branch 'ent-9160-selector-de-elementos-multiple-en-consola-visual' into 'develop' 
Ent 9160 selector de elementos multiple en consola visual

See merge request artica/pandorafms!6367
 2023-08-31 06:46:16 +00:00
Gorka Sanchez 5cc63390e0 Merge branch 'ent-11817-autorefresco-en-vista-de-mapas-de-red' into 'develop' 
Ent 11817 autorefresco en vista de mapas de red

See merge request artica/pandorafms!6368
 2023-08-31 06:35:11 +00:00
Matias Didier a3c8657853 Merge branch 'ent-11958-16155-icono-de-recuperacion-de-alerta-en-ultimos-eventos-de-la-vista-tactica-gigante' into 'develop' 
Ent 11958 16155 icono de recuperacion de alerta en ultimos eventos de la vista tactica gigante

See merge request artica/pandorafms!6371
 2023-08-29 13:12:24 +00:00
Pablo Aragon a27f5e129a 11958-Fix Recover alert icon size 2023-08-29 12:35:06 +02:00
Pablo Aragon c967211830 11958-Fix Recover alert icon size 2023-08-29 12:33:35 +02:00
Daniel Maya 287848b71c #9160 Added multi selector 2023-08-29 08:58:19 +02:00
Pablo Aragon ba964dfb16 11817-Remove Network maps from autorefresh user list 2023-08-29 08:52:50 +02:00
Pablo Aragon cd430f9f3f 11952-Fix filters in List of latest events 2023-08-28 12:27:45 +02:00
miguel angel rasteu bb3a45050f Merge branch 'develop' into ent-10637-mejora-informe-grupo 2023-08-24 12:38:23 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' 
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
 2023-08-23 05:56:19 +00:00
miguel angel rasteu 330f36a3cf Fix group view 2023-08-22 13:23:17 +02:00
miguel angel rasteu feac240905 #10637 Resolve conflicts 2023-08-22 11:49:23 +02:00
Rafael Ameijeiras 4b10cd4216 Merge branch 'ent-10946-enlaces-filtrando-por-estado-en-widget-general-group-status' into 'develop' 
Ent 10946 enlaces filtrando por estado en widget general group status

See merge request artica/pandorafms!6225
 2023-08-21 11:18:14 +00:00
Rafael Ameijeiras 82389ddf2d Merge branch 'ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento' into 'develop' 
Ent 10870 [#15385] Limpiar eventos desde la vista detallada de evento

See merge request artica/pandorafms!6174
 2023-08-21 11:10:35 +00:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
Rafael Ameijeiras dbd90d79a7 Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop' 
Ent 10344 Conexion con el servidor se ha perdido

See merge request artica/pandorafms!6228
 2023-08-21 05:58:32 +00:00
Daniel Cebrian dd5a4887a2 #10870 fixed change status from event 2023-08-18 14:14:51 +02:00
Rafael Ameijeiras 52d37be6c9 Merge branch 'ent-10850-meter-la-vista-actual-de-la-vista-detalle-de-agentes-en-el-sistema-de-favoritos' into 'develop' 
Ent 10850 meter la vista actual de la vista detalle de agentes en el sistema de favoritos

See merge request artica/pandorafms!6196
 2023-08-18 06:52:31 +00:00
Rafael Ameijeiras be7489ee93 Merge branch 'ent-9601-14239-Exportar-eventos-en-CSV-no-usa-la-TZ-del-usuario' into 'develop' 
use user configured timezone for event export

See merge request artica/pandorafms!6307
 2023-08-18 06:45:22 +00:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +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
alejandro.campos@artica.es 1fde2ed9b1 use user configured timezone for event export 2023-08-03 11:03:56 +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
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
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
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02: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
Daniel Cebrian 62a70dee2c #11326 added new section and validated if exist plugin 2023-07-24 18:42:27 +02: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
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +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