tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-20 09:18:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,357 Commits 34 Branches 30 Tags
Commit Graph

5848 Commits

Author SHA1 Message Date
Daniel Maya
b80bfa2799 #12624 change of style in dialog 2 2024-01-04 15:39:27 +01:00
Daniel Cebrian
3287ab2ee4 #11165 new popup for command whois in netflow 2024-01-03 17:06:20 +01:00
Daniel Cebrian
70f213811e #12716 fixed permission in monitor detail 2024-01-02 11:18:53 +01:00
Daniel Cebrian
05ec992fac #12522 enhanced audit log 2023-12-27 16:05:34 +01:00
Daniel Cebrian
bb92202ba2 #12706 fixed events groups by agent 2023-12-26 18:33:31 +01:00
Daniel Cebrian
adffdc3cd0 #12706 fixed line break in events metaconsole 2023-12-26 16:55:14 +01:00
Jonathan
a29452de3d #12539 1 sec to 4 sec ok button 2023-12-22 13:12:55 +01:00
Daniel Maya
7390336da0 #12697 Fixed search 2023-12-22 12:55:21 +01:00
Jonathan
6a7eca83df #12539 message 200 modules agent 2023-12-22 12:16:34 +01:00
daniel
1b034d696c fix timezone events pandora_enterprise#12677 2023-12-20 13:54:20 +01:00
Rafael Ameijeiras
8658dbc938 Merge branch 'ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center' into 'develop' 
fix error js load modal filter sound events pandora_enterprise#12607

See merge request artica/pandorafms!6739
 2023-12-20 10:21:51 +00:00
Daniel Rodriguez
477a9d665e Merge branch 'ent-12067-huevo-de-pascua-piensa-en-verde' into 'develop' 
Ent 12067 huevo de pascua piensa en verde

See merge request artica/pandorafms!6698
 2023-12-19 18:05:44 +00:00
Jonathan
d68daca985 #11900 counter items 2023-12-19 16:50:36 +01:00
Rafael Ameijeiras
46b315fbaf Merge branch 'ent-12643-conteo-paginacion-de-eventos-no-funciona' into 'develop' 
Ent 12643 conteo paginacion de eventos no funciona

See merge request artica/pandorafms!6781
 2023-12-19 15:05:05 +00:00
daniel
e07f66885d Merge remote-tracking branch 'origin/develop' into ent-12067-huevo-de-pascua-piensa-en-verde 
Conflicts:
	pandora_console/index.php
 2023-12-19 14:56:04 +01:00
daniel
d57f0971b6 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2023-12-19 14:41:12 +01:00
Jonathan
8a9fbbac8b #12515 event title ... over 300 characters 2023-12-18 16:32:39 +01:00
Jonathan
5c047fc1b5 #12657 entries order function datatables 2023-12-18 14:46:44 +01:00
daniel
8aeee6d876 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-18 11:15:18 +01:00
daniel
d56e3a5496 fix rerors duplicate in CVS pandora_enterprise#9640 2023-12-18 11:14:55 +01:00
Rafael Ameijeiras
3dd082c60f Merge branch 'ent-12647-salto-de-linea-en-nombre-de-evento' into 'develop' 
Ent 12647 Salto de linea en nombre de evento

See merge request artica/pandorafms!6777
 2023-12-18 07:52:31 +00:00
Diego Muñoz-Reja
5a9f888ecc Merge branch 'ent-12649-traza-olvidada' into 'develop' 
Ent 12649 traza olvidada

See merge request artica/pandorafms!6779
 2023-12-18 07:07:12 +00:00
Matias Didier
9158b43945 Merge branch 'ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql' into 'develop' 
move extension translate_string and file_repo pandora_enterprise#12333

See merge request artica/pandorafms!6706
 2023-12-15 11:49:11 +00:00
Jonathan
f35e7d52ed #12643 fix pagination 2023-12-15 11:34:27 +01:00
Daniel Maya
971db37147 #12649 remove trace 2023-12-15 10:19:52 +01:00
daniel
70dd1719db Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-15 09:13:07 +01:00
daniel
0584b9afd0 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-15 09:12:39 +01:00
daniel
e14a2bcb67 fix times sound events pandora_enterprise#12607 2023-12-15 09:11:05 +01:00
Diego Muñoz-Reja
fe3aa7f745 Merge branch 'ent-11166-Vista-de-datos-de-netflow-por-defecto-network-usage-map' into 'develop' 
Ent 11166 vista de datos de netflow por defecto network usage map

See merge request artica/pandorafms!6427
 2023-12-15 07:19:46 +00:00
Diego Muñoz-Reja
b545cfec23 Merge branch 'ent-11802-giss-y-entornos-pesados-optimizar-la-query-de-la-seccion-vista-de-alertas-y-vista-de-monitores' into 'develop' 
Optimiized monitors view

See merge request artica/pandorafms!6627
 2023-12-15 07:18:13 +00:00
Daniel Cebrian
67ffe8627b #12647 fixed line break in event list 2023-12-14 19:08:34 +01:00
daniel
cf692ba7ef fix times sound events pandora_enterprise#12607 2023-12-14 17:07:03 +01:00
daniel
9e3c17bf2c Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-14 16:32:33 +01:00
daniel
06f6c7d16f Merge remote-tracking branch 'origin/develop' into ent-11166-Vista-de-datos-de-netflow-por-defecto-network-usage-map 
Conflicts:
	pandora_console/operation/network/network_usage_map.php
 2023-12-14 16:13:25 +01:00
daniel
3cb4b5cce4 Merge remote-tracking branch 'origin/develop' into ent-12333-anadir-tablas-dinamicas-a-pandoradb-sql 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/67.sql
	pandora_console/operation/menu.php
 2023-12-14 11:21:51 +01:00
daniel
2890fd3dab Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-14 11:05:29 +01:00
Rafael Ameijeiras
e71a104e74 Merge branch 'ent-12566-mejoras-en-visualizacion-de-eventos' into 'develop' 
Draft: Ent 12566 Mejoras en visualización de eventos

See merge request artica/pandorafms!6735
 2023-12-14 08:57:44 +00:00
Rafael Ameijeiras
d5b3bd1c02 Merge branch 'ent-12483-varios-bugs-en-la-vista-de-campos-personalizados' into 'develop' 
Ent 12483 varios bugs en la vista de campos personalizados

See merge request artica/pandorafms!6689
 2023-12-14 08:42:02 +00:00
Rafael Ameijeiras
f3d190a8bb Merge branch 'ent-8365-ncm-fase-3' into 'develop' 
Ent 8365 ncm fase 3

See merge request artica/pandorafms!6612
 2023-12-14 08:40:31 +00:00
Rafael Ameijeiras
dcdd3e139e Merge branch 'ent-12468-instrucciones-se-rompen-en-vista-de-eventos' into 'develop' 
Ent 12468 instrucciones se rompen en vista de eventos

See merge request artica/pandorafms!6711
 2023-12-14 08:39:44 +00:00
Jonathan
53b56b31af Merge branch 'develop' into ent-8365-ncm-fase-3 2023-12-14 08:38:52 +01:00
Daniel Cebrian
fed0d92805 #12566 fixed colums module_custom_id and event_custom_id length_ 2023-12-13 19:53:14 +01:00
miguel angel rasteu
e80e7d6996 #11510 Resolve conflicts 2023-12-13 12:08:08 +01:00
Jonathan
5fa9cd5877 Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-12-13 11:19:32 +01:00
daniel
f4d2a40f13 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-13 10:58:57 +01:00
daniel
cc12c77008 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-13 10:39:48 +01:00
alejandro.campos@artica.es
160514cfbe fix filter bug 2023-12-13 10:08:13 +01:00
Jonathan
5279bb3e17 Merge branch 'develop' into ent-12296-mejorar-aspecto-filtros-de-busqueda-en-la-vista-principal-de-agentes 2023-12-13 08:24:43 +01:00
Daniel Cebrian
1a9bdf97d1 #12566 changes in view events 2023-12-11 17:01:40 +01:00
Rafael Ameijeiras
7f75445d75 Merge branch 'ent-11537-bug-en-cuadros-de-busqueda-con-los-caracteres-2-y-0' into 'develop' 
Ent 11537 bug en cuadros de busqueda con los caracteres 2 y 0

See merge request artica/pandorafms!6410
 2023-12-11 14:30:51 +00:00