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 |
Daniel Cebrian
|
538177c3e5
|
#12753 fixed vul command in ajax
|
2024-01-23 17:08:06 +01:00 |
Rafael Ameijeiras
|
f0d892c268
|
Merge branch 'ent-12601-16734-Filtros-de-tags-en-eventos-ignoran-criticidad-configurada-en-filtro' into 'develop'
fix tags filter
See merge request artica/pandorafms!6780
|
2024-01-18 11:34:02 +00:00 |
Matias Didier
|
fd0c2a3da6
|
Merge branch 'ent-12543-16631-paginado-de-la-vista-eventos-en-metaconsola-los-elementos-a-mostrar-son-erroneos' into 'develop'
Ent 12543 [#16631]Paginado de la vista eventos en metaconsola, los elementos a mostrar son erroneos
See merge request artica/pandorafms!6712
|
2024-01-18 08:36:34 +00:00 |
|
Daniel Cebrian
|
5fbf3fea7a
|
#12704 fixed filter in list events
|
2023-12-26 11:15:10 +01:00 |
daniel
|
88308da560
|
fix search events pandora_enterprise#12704
|
2023-12-22 13:43:13 +01:00 |
|
alejandro.campos@artica.es
|
47fd35c53f
|
fix tags filter
|
2023-12-15 10:48:10 +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
|
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 |
|
alejandro.campos@artica.es
|
160514cfbe
|
fix filter bug
|
2023-12-13 10:08:13 +01:00 |
Daniel Maya
|
9dbac217c1
|
#12633 Fixed Acknowledged 2
|
2023-12-12 14:07:18 +01:00 |
|
Daniel Maya
|
90c91f67fa
|
#12633 Fixed Acknowledged
|
2023-12-12 12:45:13 +01:00 |
|
Daniel Cebrian
|
1a9bdf97d1
|
#12566 changes in view events
|
2023-12-11 17:01:40 +01:00 |
|
daniel
|
10515e88df
|
Merge remote-tracking branch 'origin/develop' into ent-12209-module-histogram-widget-no-coge-bien-los-estados-del-modulo
|
2023-12-05 12:37:17 +01:00 |
miguel angel rasteu
|
fb2e433b5c
|
#12175 Resolve conflicts
|
2023-12-01 10:00:51 +01:00 |
|
Daniel Cebrian
|
28820f4471
|
#12543 fixed pagination metaconsole
|
2023-11-29 11:04:48 +01:00 |
|
Daniel Maya
|
892048554e
|
#12468 Fixed instructions
|
2023-11-29 10:27:55 +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
|
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 |
|
Daniel Cebrian
|
4c475239c9
|
#12513 fixed bug in alert triggered
|
2023-11-23 17:15:44 +01:00 |
|
Jonathan
|
11cc31c0ad
|
#11705 Event custom id edit by EW only
|
2023-11-23 10:23:57 +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 |
|
Jonathan
|
63b069d739
|
#11705 fix for id as array
|
2023-11-22 11:20:46 +01:00 |
|
daniel
|
161b0e8a34
|
Add filter eventcardboard pandora_enterprise#11760
|
2023-11-08 10:31:42 +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 Maya
|
287b983ce9
|
#12371 Fixed events
|
2023-11-02 15:39:55 +01:00 |
|
miguel angel rasteu
|
84ab19119b
|
#12175 Fix recovery alert icon
|
2023-11-02 15:11:53 +01:00 |
|
daniel
|
fa39a97518
|
Module histogram only events pandora_enterprise#12209
|
2023-10-27 10:18:10 +02:00 |
|
daniel
|
db6f53760e
|
Merge remote-tracking branch 'origin/develop' into ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged
|
2023-10-06 13:04:04 +02:00 |
|
miguel angel rasteu
|
6312804386
|
#12153 Fix graph height
|
2023-10-05 09:52:52 +02:00 |
|
miguel angel rasteu
|
87aa79b176
|
#12153 Fix graph
|
2023-10-05 09:45:17 +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 |
|
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 |
|
Jonathan
|
6db13cc55a
|
merge conflict solution
|
2023-09-28 13:14:49 +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 |
|
Jonathan
|
70e3707b64
|
#11705 group extra id heredity event custom id
|
2023-09-25 12:22:10 +02:00 |
|
daniel
|
2e63546550
|
add new type search status events not in process pandora_enterprise#11760
|
2023-09-25 11:29:38 +02:00 |
|
Jonathan
|
e5c5f91576
|
#11705 change name event_custom_id
|
2023-09-25 10:32:23 +02:00 |
|
Jonathan
|
79fe89c3c5
|
#11705 new custom_field tevento
|
2023-09-22 12:24:15 +02:00 |
Jorge Rincon
|
08fe98a8ba
|
fixed filter display permissions in modal
|
2023-09-15 13:57:14 +02:00 |
|
Jorge Rincon
|
764d5908bb
|
Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados
|
2023-09-11 10:58:37 +02:00 |
|
daniel
|
5a61f074d7
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-22 09:22:11 +02:00 |
|
Daniel Cebrian
|
dd5a4887a2
|
#10870 fixed change status from event
|
2023-08-18 14:14:51 +02:00 |
|
Daniel Cebrian
|
fa04db27a7
|
Merge branch 'develop' into ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento
|
2023-08-18 10:40:29 +02:00 |
|
Jorge Rincon
|
3e4178c490
|
Merge branch develop into ent-10065-post-filtros-de-eventos-privados
|
2023-08-18 09:19:57 +02:00 |
|
daniel
|
8bc65474f0
|
ITSM pandora_enterprise#11471
|
2023-08-16 16:52:57 +02:00 |
|
daniel
|
133eef456a
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-14 08:14:34 +02:00 |