Rafael Ameijeiras
|
e91230b165
|
Merge branch 'ent-12440-16596-agregar-acl-operation-events-events-no-hace-nada' into 'develop'
Ent 12440 16596 agregar acl operation events events no hace nada
See merge request artica/pandorafms!6713
|
2023-12-04 08:12:48 +00:00 |
|
Rafael Ameijeiras
|
aa9aa40ebd
|
Merge branch 'ent-12213-cambiar-update-manager-por-warp-update' into 'develop'
Ent 12213 cambiar update manager por warp update
See merge request artica/pandorafms!6546
|
2023-12-01 10:07:07 +00:00 |
miguel angel rasteu
|
b89f182e19
|
#12213 Resolve conflicts
|
2023-12-01 10:31:50 +01:00 |
|
miguel angel rasteu
|
5ee6eb7306
|
#12052 Resolve conflicts
|
2023-12-01 10:19:39 +01:00 |
Daniel Rodriguez
|
39c6420d2c
|
Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop'
Ent 11763 15982 regex en busqueda de eventos
See merge request artica/pandorafms!6512
|
2023-12-01 08:44:46 +00:00 |
Jonathan
|
75d57337af
|
#11705 Fix merge conflict
|
2023-11-30 08:10:32 +01:00 |
|
Jonathan
|
e8272c0006
|
#11763 Fix merge conflict
|
2023-11-30 07:57:25 +01:00 |
|
Rafael Ameijeiras
|
60d9fffe22
|
Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop'
Ent 12137 propuesta de refactoring visual de vista ppal de agente
See merge request artica/pandorafms!6520
|
2023-11-29 14:26:53 +00:00 |
|
Jonathan
|
4c25e4cab1
|
#12440 add operation/events/events check readonly
|
2023-11-29 11:55:59 +01:00 |
|
Jonathan
|
f86a3e60e8
|
#11763 save filter regex on bbdd
|
2023-11-29 11:14:40 +01:00 |
|
Jonathan
|
49a81b34c4
|
Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos
|
2023-11-28 09:50:48 +01:00 |
|
Jonathan
|
9819c3a5ff
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-28 08:30:23 +01:00 |
|
Rafael Ameijeiras
|
215c665a9c
|
Merge branch 'ent-12173-nombres-de-modulos-en-vista-de-eventos-se-muestran-de-manera-incorrecta' into 'develop'
Ent 12173 nombres de modulos en vista de eventos se muestran de manera incorrecta
See merge request artica/pandorafms!6565
|
2023-11-27 14:51:48 +00:00 |
|
Rafael Ameijeiras
|
4ac9316391
|
Merge branch 'ent-12079-no-se-aplican-los-filtros-por-defecto-al-hacer-clic-en-el-numero-de-alertas' into 'develop'
Ent 12079 no se aplican los filtros por defecto al hacer clic en el numero de alertas
See merge request artica/pandorafms!6475
|
2023-11-27 14:51:02 +00:00 |
|
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 |
|
Rafael Ameijeiras
|
707f85ed7f
|
Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop'
Ent 11511 cambiar el apartado de tools a seccion management
See merge request artica/pandorafms!6403
|
2023-11-27 14:36:38 +00:00 |
|
miguel angel rasteu
|
e967b5820a
|
Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente
|
2023-11-27 13:06:51 +01:00 |
|
miguel angel rasteu
|
cac31cc482
|
#12137 Resolve conflicts
|
2023-11-27 13:05:43 +01:00 |
|
Rafael Ameijeiras
|
074ea7a9c9
|
Merge branch 'ent-12159-16357-cuadro-de-busqueda-no-muestra-agentes-cuando-se-busca-con-un-guion-bajo' into 'develop'
Ent 12159 16357 cuadro de busqueda no muestra agentes cuando se busca con un guion bajo
See merge request artica/pandorafms!6519
|
2023-11-27 11:58:59 +00:00 |
Matias Didier
|
c7d28b9a77
|
Merge branch 'ent-12356-botones-de-paginacion-de-la-vista-de-interfaces-duplicados' into 'develop'
Fix pagination interfaces pandora_enterprise#12356
See merge request artica/pandorafms!6626
|
2023-11-27 11:38:19 +00:00 |
|
Rafael Ameijeiras
|
63f5396d30
|
Merge branch 'ent-12043-cve-2023-41814-vulnerabilidad-xss-mensajes' into 'develop'
Ent 12043 cve 2023 41814 vulnerabilidad xss mensajes
See merge request artica/pandorafms!6492
|
2023-11-27 11:20:10 +00:00 |
|
miguel angel rasteu
|
b0125d943e
|
#12138 Resolve conflict
|
2023-11-27 11:51:00 +01:00 |
|
miguel angel rasteu
|
a4cd6d7fe1
|
#12138 Resolve conflict
|
2023-11-27 11:43:24 +01:00 |
|
Rafael Ameijeiras
|
5d94be5e7f
|
Merge branch 'ent-12134-contador-de-agentes-modulos-en-las-vistas' into 'develop'
Ent 12134 contador de agentes modulos en las vistas
See merge request artica/pandorafms!6566
|
2023-11-27 10:42:01 +00:00 |
|
Rafael Ameijeiras
|
e5c708298b
|
Merge branch 'ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged' into 'develop'
add new type search status events not in process pandora_enterprise#11760
See merge request artica/pandorafms!6491
|
2023-11-27 10:41:28 +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 |
|
miguel angel rasteu
|
262affeb74
|
Merge branch 'develop' into ent-12138-eliminar-agent-access-graph
|
2023-11-27 08:18:35 +01:00 |
|
Jonathan
|
4f707a5a1b
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-23 09:27:46 +01:00 |
|
miguel angel rasteu
|
99c5da677d
|
#12137 Fix entities
|
2023-11-16 08:37:41 +01:00 |
|
miguel angel rasteu
|
8b9d52646c
|
Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente
|
2023-11-16 08:06:20 +01:00 |
Daniel Maya
|
6059f4dea0
|
#12453 Changed string
|
2023-11-15 13:10:19 +01:00 |
|
Daniel Rodriguez
|
7fdca7aa12
|
Merge branch 'ent-11125-pandora-security-monitoring-vulnerability-scanner' into 'develop'
Add support for inventory vulnerability scans.
See merge request artica/pandorafms!6487
|
2023-11-13 08:24:48 +00:00 |
|
Rafael Ameijeiras
|
8c26dbe973
|
Merge branch 'ent-12423-error-en-vista-de-alertas-de-un-agente-visor' into 'develop'
Remove filter group for alert pandora_enterprise#12423
See merge request artica/pandorafms!6640
|
2023-11-10 13:09:28 +00:00 |
Ramon Novoa
|
8ec1432414
|
Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner
|
2023-11-10 09:53:17 +01:00 |
|
Jonathan
|
80d85c1149
|
Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos
|
2023-11-08 15:29:14 +01:00 |
|
Jonathan
|
82759ae12f
|
#11763 regex events
|
2023-11-08 15:24:47 +01:00 |
|
Matias Didier
|
ca8d0ed7f8
|
Merge branch 'ent-12376-problemas-vistos-en-la-nueva-vista-tactica' into 'develop'
Ent 12376 Problemas vistos en la nueva vista táctica
See merge request artica/pandorafms!6628
|
2023-11-08 13:36:10 +00:00 |
|
Jonathan
|
1d065c2fbb
|
Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos
|
2023-11-08 14:16:09 +01:00 |
daniel
|
9ccb6a98c6
|
fix alert details pandora_enterprise#12423
|
2023-11-08 12:49:45 +01:00 |
|
daniel
|
5bc1cb1862
|
Merge remote-tracking branch 'origin/develop' into ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged
|
2023-11-08 09:48:46 +01:00 |
|
daniel
|
c81b42cc95
|
Remove filter group for alert pandora_enterprise#12423
|
2023-11-07 16:17:13 +01:00 |
Daniel Cebrian
|
8f8e5ecf45
|
#12376 multiple changes in general tactical view
|
2023-11-07 13:18:44 +01:00 |
|
Jonathan
|
545316e9a8
|
#11763 regex fix html entities
|
2023-11-07 08:35:49 +01:00 |
|
Jonathan
|
94d5d58636
|
Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos
|
2023-11-07 08:31:18 +01:00 |
|
miguel angel rasteu
|
de22886cec
|
#11679 Fix edit module link in search and fix checkbox switch bug in edit module
|
2023-11-06 08:55:21 +01:00 |
|
daniel
|
84d450e35e
|
Fix pagination interfaces pandora_enterprise#12356
|
2023-11-03 13:10:09 +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 |
|
miguel angel rasteu
|
88f1b964e3
|
Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente
|
2023-11-02 15:22:57 +01:00 |
|
miguel angel rasteu
|
3822ffc0f0
|
#12137 Fix agent view
|
2023-11-02 15:22:49 +01:00 |
|
miguel angel rasteu
|
47aeb3cc39
|
#12137 Fix Description
|
2023-11-02 13:22:42 +01:00 |