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

5709 Commits

Author SHA1 Message Date
alejandro.campos@artica.es c9bde8d90a Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-23 11:14:17 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop' 
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
 2024-02-22 16:21:32 +00:00
Rafael Ameijeiras f9b6008296 Merge branch 'ent-12497-usabilidad-implementar-boton-mas-operaciones' into 'develop' 
Ent 12497 usabilidad implementar boton mas operaciones

See merge request artica/pandorafms!6955
 2024-02-22 16:20:13 +00:00
alejandro.campos@artica.es 195766e11c minor fixes 2024-02-22 15:05:48 +01:00
alejandro.campos@artica.es 1991b74b9b Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-21 10:05:11 +01:00
Rafael Ameijeiras 6d3c88efc0 Merge branch 'ent-12524-GISS-Problemas-para-abrir-elementos-en-nuevas-pestañas-Vista-Monitores-y-Alertas' into 'develop' 
Ent 12524 giss problemas para abrir elementos en nuevas pestañas vista monitores y alertas

See merge request artica/pandorafms!6720
 2024-02-21 07:59:15 +00:00
Jonathan 1bdddac95e #12497 dots agent view 2024-02-20 13:33:36 +01:00
Jonathan a050c40976 #12524 blank and send parameters on control + click 2024-02-20 08:26:02 +01:00
Jonathan 68ff17ebf4 Merge branch 'develop' into ent-12633-errores-visuales-en-la-funcionalidad-graph-analytics 2024-02-19 12:10:11 +01:00
alejandro.campos@artica.es df7435132a change regex search in events 2024-02-16 10:10:38 +01:00
Jonathan 5dd9acb02b #12524 disable auto start alerts 2024-02-15 13:54:14 +01:00
Jonathan 097f945a7a Merge branch 'develop' into ent-12524-GISS-Problemas-para-abrir-elementos-en-nuevas-pestañas-Vista-Monitores-y-Alertas 2024-02-15 11:44:30 +01:00
Jonathan e6e98aeb39 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-15 09:08:25 +01:00
Jonathan 42975c7967 #12695 wip removing warnings 2024-02-14 17:43:20 +01:00
Jonathan 7f580cc388 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-13 09:42:00 +01:00
Jonathan 0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
miguel angel rasteu 301ca0f710 #12866 Fix Other OS name and version in Agent view 2024-02-12 09:42:20 +01:00
Jonathan d590961e69 #12695 wip removing warnings 2024-02-09 13:51:56 +01:00
Rafael Ameijeiras 140ed1c304 Merge branch 'ent-12321-widget-mapa-gis' into 'develop' 
Ent 12321 widget mapa gis

See merge request artica/pandorafms!6835
 2024-02-09 09:23:42 +00:00
Rafael Ameijeiras 4cdea9d8ef Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop' 
Ent 12460 Cientos de errores en el log de apache

See merge request artica/pandorafms!6748
 2024-02-09 09:22:48 +00:00
Jonathan 6e1fb2f061 #12695 wip removing warnings 2024-02-08 17:17:17 +01:00
Daniel Maya 8524e7ba31 Merge branch 'develop' into ent-12321-widget-mapa-gis 2024-02-08 09:34:32 +01:00
Jonathan 2246fd8049 #12695 WIP warnings 2024-02-07 16:39:33 +01:00
Jonathan 834635a487 Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-07 10:39:47 +01:00
Jonathan 499ea9b805 #12633 fix visuals errors 2024-02-07 09:21:42 +01:00
Diego Muñoz-Reja 1980b36c17 Merge branch 'ent-11165-anadir-info-de-whois-de-una-ip-dada-en-netflow-explorer' into 'develop' 
Ent 11165 Añadir info de whois de una IP dada en Netflow explorer

See merge request artica/pandorafms!6827
 2024-01-31 09:14:44 +00:00
Daniel Cebrian d4ceb1ac4d Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 17:11:30 +01:00
Daniel Cebrian f68615cba0 #12460 fixed deprecated 2024-01-30 17:00:38 +01:00
Daniel Cebrian 5b7a123086 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-30 13:21:44 +01:00
Daniel Cebrian 4971c29819 #12789 fixed pagination in events 2024-01-30 09:25:17 +01:00
Daniel Cebrian 61e38865f6 Merge branch 'develop' into ent-12789-busqueda-por-regex-funciona-mal 2024-01-30 08:53:04 +01:00
Daniel Cebrian 1738a06cf2 #12789 added tip in regex search 2024-01-29 13:42:09 +01:00
Diego Muñoz-Reja eba2f45ed1 Merge branch 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' into 'develop' 
fix filter bug

See merge request artica/pandorafms!6761
 2024-01-29 12:39:42 +00:00
Daniel Cebrian f01902903c #12789 fixed regex in event table 2024-01-29 13:38:29 +01:00
Rafael Ameijeiras ccaa25da23 Merge branch 'ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor' into 'develop' 
Ent 12657 mostrar show entries de eventos de menor a mayor

See merge request artica/pandorafms!6785
 2024-01-29 09:30:55 +00:00
Alejandro Campos 618f677906 Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' 
# Conflicts:
#   pandora_console/include/functions_events.php
#   pandora_console/operation/events/events.php
 2024-01-26 13:42:59 +00:00
Jonathan c07ecff571 #12807 check id_agent for alert view 2024-01-26 08:13:10 +01:00
Rafael Ameijeiras e19f520eb0 Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop' 
Ent 12522 Mejoras en audit log

See merge request artica/pandorafms!6816
 2024-01-25 14:00:56 +00:00
Daniel Cebrian fbb5d349a2 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-24 11:58:00 +01:00
Rafael Ameijeiras b019abbb97 Merge branch 'ent-12782-vista-de-eventos-se-ve-feo-la-paginacion-en-una-pantalla-de-1300px-de-ancho' into 'develop' 
Ent 12782 Vista de eventos: se ve feo la paginacion en una pantalla de 1300px de ancho

See merge request artica/pandorafms!6871
 2024-01-23 15:44:49 +00:00
Diego Muñoz-Reja 43cb4878cc Merge branch 'ent-12518-campo-personalizado-de-enlace-web-desde-agente-software-codifica-mal-al-guardar-en-base-de-datos' into 'develop' 
Ent 12518 campo personalizado de enlace web desde agente software codifica mal al guardar en base de datos

See merge request artica/pandorafms!6732
 2024-01-23 11:28:59 +00:00
Matias Didier eba0ce9e80 Merge branch 'ent-12624-cambio-estilo-de-ventanas-modales' into 'develop' 
Ent 12624 cambio estilo de ventanas modales

See merge request artica/pandorafms!6826
 2024-01-23 09:44:21 +00:00
Rafael Ameijeiras 30f6e9ea36 Merge branch 'ent-12539-mostrar-dialogo-con-retardo-de-cierre-en-vista-ppal-de-agente' into 'develop' 
Ent 12539 mostrar dialogo con retardo de cierre en vista ppal de agente

See merge request artica/pandorafms!6807
 2024-01-23 07:27:34 +00:00
Rafael Ameijeiras b14825b2b3 Merge branch 'ent-12734-perdida-de-agente-al-actualizar-gis-map' into 'develop' 
Ent 12734 perdida de agente al actualizar gis map

See merge request artica/pandorafms!6839
 2024-01-23 07:21:50 +00:00
Daniel Cebrian 17056e4ac3 #12460 merge with 12643 2024-01-22 15:30:46 +01:00
Daniel Cebrian d504267460 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-22 15:18:01 +01:00
Daniel Cebrian 54e3f94d62 #12782 fixed button sound events style in events 2024-01-22 15:07:25 +01:00
Matias Didier b38d50a3b2 Merge branch 'ent-12515-bug-al-mostrar-el-evento-completo-en-un-tooltip-en-la-vista-de-eventos' into 'develop' 
Ent 12515 bug al mostrar el evento completo en un tooltip en la vista de eventos

See merge request artica/pandorafms!6787
 2024-01-22 09:30:08 +00:00
Matias Didier 1664764fb1 Merge branch 'ent-12439-16595-lista-del-buscador-no-marca-agentes-silenciosos' into 'develop' 
Ent 12439 16595 lista del buscador no marca agentes silenciosos

See merge request artica/pandorafms!6678
 2024-01-19 11:16:51 +00:00
Daniel Rodriguez cc33e5413a Merge branch 'ent-12202-eastern-egg-asteroids' into 'develop' 
Ent 12202 eastern egg asteroids

See merge request artica/pandorafms!6693
 2024-01-19 11:10:55 +00:00