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

1347 Commits

Author SHA1 Message Date
Rafael Ameijeiras 8e68198ab5 Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop' 
Ent 11679 15855 nombres de modulos no tienen link a su edicion

See merge request artica/pandorafms!6422
 2023-11-27 14:39:14 +00:00
Matias Didier d544ef4ac5 Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop' 
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola

See merge request artica/pandorafms!6539
 2023-11-27 12:24:22 +00:00
Rafael Ameijeiras d6e613ca8b Merge branch 'ent-11791-any-user-can-change-any-other-user-s-notification-settings' into 'develop' 
Ent 11791 any user can change any other user s notification settings

See merge request artica/pandorafms!6400
 2023-11-27 11:19:14 +00:00
Diego Muñoz-Reja a0db8f5755 Merge branch 'ent-12204-visualizar-icono-de-los-modulso-pendientes-de-ejecucion-porque-se-han-forzado' into 'develop' 
Ent 12204 visualizar icono de los modulso pendientes de ejecucion porque se han forzado

See merge request artica/pandorafms!6550
 2023-11-27 10:34:56 +00:00
Diego Muñoz-Reja 59bed70175 Merge branch 'ent-12153-grafica-de-eventos-a-lo-largo-del-tiempo-en-vista-de-eventos' into 'develop' 
Ent 12153 grafica de eventos a lo largo del tiempo en vista de eventos

See merge request artica/pandorafms!6532
 2023-11-27 10:32:34 +00:00
Daniel Maya 300e01c186 #12502 Fixed filter 2023-11-22 10:10:35 +01:00
Gorka Sanchez 7748b59694 Merge branch 'ent-9946-meter-busqueda-en-listado-de-dashboard' into 'develop' 
Ent 9946 meter busqueda en listado de dashboard

See merge request artica/pandorafms!6398
 2023-11-20 15:20:46 +00:00
miguel angel rasteu 748238a7ea #11791 Prevent any user from changing another user's notification settings in AJAX 2023-11-10 10:03:13 +01:00
miguel angel rasteu c2b3eb14bf Merge branch 'develop' into ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion 2023-11-03 09:43:04 +01:00
Daniel Maya 287b983ce9 #12371 Fixed events 2023-11-02 15:39:55 +01:00
Calvo 715f6abc69 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-24 14:02:36 +02:00
Diego Muñoz-Reja 48c314669a Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop' 
Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización)

See merge request artica/pandorafms!6485
 2023-10-23 07:24:20 +00:00
Calvo 1ef42182a7 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-20 10:46:34 +02:00
Matias Didier dcd891eedb Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop' 
Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2

See merge request artica/pandorafms!6578
 2023-10-20 05:51:32 +00:00
Jonathan 98388bb7d2 #12286 fix dashboard vulnerability login admin 2023-10-19 17:06:01 +02:00
daniel eb5e56cc78 Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile 2023-10-19 08:16:33 +02:00
Daniel Cebrian 9237e4038a Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-10-16 17:10:33 +02:00
miguel angel rasteu 5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
miguel angel rasteu 3a2b56cc4c #12204 Fix force check icon 2023-10-10 16:50:42 +02:00
Daniel Cebrian 9b675868b9 Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-10-09 16:43:25 +02:00
miguel angel rasteu 049e25f866 #8686 Add filter in managemnet tree group 2023-10-06 13:51:18 +02:00
daniel 588f19fa18 fix cv in mobile pandora_enterprise#12196 2023-10-06 12:59:33 +02:00
miguel angel rasteu 09cae778c5 #12153 Create event list graph 2023-10-04 16:28:40 +02:00
miguel angel rasteu 874cb9c52a #12153 Create button and ajax request 2023-10-04 12:41:23 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-10-03 13:11:09 +00:00
Daniel Cebrian 438cb11f95 #10194 added automonitoritation modules and interval refresh async 2023-10-02 16:44:53 +02:00
Rafael Ameijeiras 439d5b54aa Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop' 
Agents show events 24h switch checked default

See merge request artica/pandorafms!6405
 2023-10-02 07:08:52 +00:00
Daniel Cebrian b8df74dace Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion 2023-09-28 16:22:58 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop' 
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
 2023-09-28 10:05:15 +00:00
Daniel Cebrian 62d501e6d5 #10194 sections Alerts and Events 2023-09-27 13:30:56 +02:00
Calvo 0b4ee35780 Fix query agent events 2023-09-27 11:01:21 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-09-25 17:06:08 +02:00
Luis 086835765d Merge branch 'develop' into 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-09-25 14:08:43 +00:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
alejandro.campos@artica.es 6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
Daniel Cebrian 73d179e52f #12001 added autoselect module in inventory 2023-09-20 12:14:55 +02:00
Daniel Rodriguez 6ecd8ca899 Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop' 
Draft: Ent 10065 post filtros de eventos privados

See merge request artica/pandorafms!6318
 2023-09-18 07:55:18 +00:00
Rafael Ameijeiras b568085841 Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop' 
not show edition buttons of alert detail pandora_enterprise#12035

See merge request artica/pandorafms!6444
 2023-09-18 07:22:13 +00:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel 16f1d80919 not show edition buttons of alert detail pandora_enterprise#12035 2023-09-12 12:30:52 +02:00
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
Rafael Ameijeiras 0c6aaa6723 Merge branch 'ent-11993-user-notifications-esta-roto' into 'develop' 
Ent 11993 user notifications esta roto

See merge request artica/pandorafms!6412
 2023-09-11 07:15:38 +00:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/functions_menu.php
 2023-09-08 13:11:52 +02:00
Calvo c4271bf737 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-07 17:58:27 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
miguel angel rasteu f445066d13 #11679 Fix linked module name 2023-09-07 16:29:18 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00