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

19366 Commits

Author SHA1 Message Date
Daniel Maya 59ef20e214 #11739 Fixed date_format 2023-08-03 10:56:28 +02:00
miguel angel rasteu 2ced051f56 #11668 Fix modal 2023-08-03 09:43:06 +02:00
Rafael Ameijeiras a653c0e2e7 Merge branch 'ent-9866-visualizacion-completa-de-notificaciones-en-metaconsola' into 'develop' 
Ent 9866 visualizacion completa de notificaciones en metaconsola

See merge request artica/pandorafms!6170
 2023-08-03 07:03:47 +00:00
Pablo Aragon 413528146b 9558-Fix background url html_print_autocomplete_modules() 2023-08-03 08:25:38 +02:00
artica ab0fda5a5d Auto-updated build strings. 2023-08-03 01:00:42 +02:00
miguel angel rasteu fddc709aee #11219 Fix transaltes 2023-08-02 14:48:02 +02:00
Rafael Ameijeiras 507c91ab1e Merge branch 'ent-11683-faltan-opciones-en-las-listas-de-dias-especiales' into 'develop' 
Ent 11683 Faltan opciones en las listas de días especiales

See merge request artica/pandorafms!6221
 2023-08-02 12:01:07 +00:00
Rafael Ameijeiras b23397ef82 Merge branch 'ent-11707-iconos-de-modulos-en-tree-view-estan-pegados-al-texto' into 'develop' 
Ent 11707 iconos de modulos en tree view estan pegados al texto

See merge request artica/pandorafms!6229
 2023-08-02 11:43:31 +00:00
Rafael Ameijeiras e6eee88a63 Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop' 
Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil

See merge request artica/pandorafms!6010
 2023-08-02 10:42:36 +00:00
Rafael Ameijeiras d96977b883 Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop' 
Ent 10562 nueva vista de detalle de alertas encoladas

See merge request artica/pandorafms!6273
 2023-08-02 08:26:50 +00:00
Rafael Ameijeiras 25b2532c7a Merge branch 'ent-11777-API-add-event-comment-se-ha-roto-cambios-tevent-comment' into 'develop' 
fixed api call

See merge request artica/pandorafms!6288
 2023-08-02 08:26:10 +00:00
Daniel Maya ae22b99835 Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second 2023-08-02 09:10:04 +02:00
artica d3fdb28d05 Auto-updated build strings. 2023-08-02 01:00:29 +02:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es 700bb53df4 implemented pending alerts list for event server 2023-08-01 14:37:16 +02:00
Rafael Ameijeiras b052711c92 Merge branch 'ent-11697-arreglar-menu-sin-click-to-display' into 'develop' 
Draft: Ent 11697 arreglar menu sin click to display

See merge request artica/pandorafms!6230
 2023-08-01 12:32:37 +00:00
Jonathan 3b38824ca7 #11697 arrow left menu collapse 2023-08-01 13:06:43 +02:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
artica dcb9f89b5d Auto-updated build strings. 2023-08-01 01:00:44 +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 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
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
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 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
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +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 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
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
Rafael Ameijeiras 9f888643bf Merge branch 'ent-11602-vista-de-traps-no-mantiene-el-ancho-ni-traps-abiertas' into 'develop' 
Ent 11602 vista de traps no mantiene el ancho ni traps abiertas

See merge request artica/pandorafms!6146
 2023-07-27 05:46:57 +00:00
artica cc9f3c6df2 Auto-updated build strings. 2023-07-27 01:00:55 +02:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Daniel Maya bee65bc575 #11739 Fixed deprecated functions 2023-07-26 14:18:20 +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 161ad1b6f7 Merge branch 'ent-11764-refactorizacion-visual-del-formulario-de-filtro-de-la-vista-de-logs' into 'develop' 
Ent 11764 refactorizacion visual del formulario de filtro de la vista de logs

See merge request artica/pandorafms!6280
 2023-07-26 05:05:01 +00:00
artica 244c717355 Auto-updated build strings. 2023-07-26 01:00:54 +02:00
Daniel Cebrian a3d5bd80f9 #11326 fixed dark theme in security hardening 2023-07-25 14:25:16 +02:00
Rafael Ameijeiras d046e82208 Merge branch 'ent-11644-desaparece-selector-en-bulk-operations-en-nodo-centralizado' into 'develop' 
Ent 11644 desaparece selector en bulk operations en nodo centralizado

See merge request artica/pandorafms!6168
 2023-07-25 11:04:38 +00:00
Pablo Aragon 5732997d4a 11764-Log viewer, view agent 2023-07-25 12:26:40 +02:00
miguel angel rasteu 7c9d441648 #11386 Fix modal error 2023-07-25 11:12:05 +02:00
Rafael Ameijeiras 7b0c8cffaa Merge branch 'ent-11769-Vista-de-nodos-en-la-meta-rota' into 'develop' 
fixed error with new implementation of datatables

See merge request artica/pandorafms!6277
 2023-07-25 08:52:38 +00:00
miguel angel rasteu 0c995b5dd5 #11755 Fix netflow live view pie graph 2023-07-25 10:33:29 +02:00
Rafael Ameijeiras 39edfa48df Merge branch 'ent-11419-pequenos-cambios-en-widget-de-graficas-simples' into 'develop' 
Ent 11419 Pequeños cambios en widget de graficas simples

See merge request artica/pandorafms!6155
 2023-07-25 08:04:23 +00:00
Rafael Ameijeiras 1f52a2d466 Merge branch 'ent-11031-en-visor-de-auditoria-los-filtros-personalizados-tienen-tres-detalles-que-vale-la-pena' into 'develop' 
Ent 11031 en visor de auditoria los filtros personalizados tienen tres detalles que vale la pena

See merge request artica/pandorafms!6235
 2023-07-25 07:54:36 +00:00
Rafael Ameijeiras 387d18a8af Merge branch 'ent-11057-meter-un-poco-de-borde-de-sombra-a-las-letras-de-login-para-que-se-vean-mejor' into 'develop' 
Ent 11057 meter un poco de borde de sombra a las letras de login para que se vean mejor

See merge request artica/pandorafms!6167
 2023-07-25 07:52:40 +00:00
Rafael Ameijeiras ce9d5218e7 Merge branch 'ent-11724-bug-del-boton-show-hide-de-campos-sensibles' into 'develop' 
Ent 11724 bug del boton show hide de campos sensibles

See merge request artica/pandorafms!6238
 2023-07-25 07:50:19 +00:00
alejandro.campos@artica.es f027173862 fixed error with new implementation of datatables 2023-07-25 09:26:58 +02:00
artica 1de2fe9898 Auto-updated build strings. 2023-07-25 01:02:35 +02:00
Daniel Cebrian 62a70dee2c #11326 added new section and validated if exist plugin 2023-07-24 18:42:27 +02:00
Jorge Rincon 19c600fb9b #11467 fixed error message and advanced info section from tree view 2023-07-24 14:54:38 +02:00
Rafael Ameijeiras 6b3b98ac04 Merge branch 'ent-11480-widget-de-estado-de-grupos-no-deberia-mostar-grupos-vacios' into 'develop' 
Ent 11480 Widget de estado de grupos no deberia mostar grupos vacios

See merge request artica/pandorafms!6152
 2023-07-24 10:54:24 +00:00
miguel angel rasteu a1965de2ea #11386 Fix sound alert modal 2023-07-24 12:25:06 +02:00
Daniel Cebrian e88a33d984 #11326 added new property in chartjs 2023-07-24 12:22:20 +02:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
artica c57fb14bc2 Auto-updated build strings. 2023-07-24 01:00:48 +02:00
artica 3e6f88e812 Auto-updated build strings. 2023-07-23 01:00:51 +02:00
artica 13552e74f1 Auto-updated build strings. 2023-07-22 01:00:52 +02:00
Daniel Cebrian 247bcc1cf5 #11326 fixed bug and reorganized data 2023-07-21 19:38:06 +02:00
miguel angel rasteu 5084c0490b #11386 Fix changes in soun event dialog 2023-07-21 13:32:12 +02:00
alejandro.campos@artica.es 66d2fef3aa implemented pending alerts list for event server 2023-07-21 11:53:04 +02:00
alejandro.campos@artica.es 7b9170312c implemented pending alerts list for event server 2023-07-21 11:50:53 +02:00
Daniel Rodriguez 4148074996 Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop' 
added setup token

See merge request artica/pandorafms!6133
 2023-07-21 07:23:33 +00:00
artica 6da7520dd1 Auto-updated build strings. 2023-07-21 01:00:53 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +02:00
miguel angel rasteu ed77e042e1 #11751 Fix node CSV 2023-07-20 13:16:25 +02:00
artica 1f722998e6 Auto-updated build strings. 2023-07-20 01:01:06 +02:00
daniel a10412872b alerts user comment pandora_enterprise#11387 2023-07-19 15:04:37 +02:00
Rafael Ameijeiras 9ff13234be Merge branch 'ent-10696-nuevo-widget-netflow' into 'develop' 
Ent 10696 nuevo widget netflow

See merge request artica/pandorafms!5890
 2023-07-19 11:54:01 +00: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 Cebrian 018bfe1288 #10696 fixed resize circular mesh 2023-07-19 10:36:30 +02:00
Daniel Cebrian c8f7ab2f1c #11326 new modal details 2023-07-19 09:08:44 +02:00
artica e645f65e8e Auto-updated build strings. 2023-07-19 01:00:45 +02:00
Daniel Cebrian 6eaa8e9cd8 #11326 fixed pagination with multiples datatable 2023-07-18 14:52:34 +02:00