Pablo Aragon
|
38a05d2a79
|
Events meta
|
2023-02-28 09:50:42 +01:00 |
|
Pablo Aragon
|
e024658520
|
10454-Events
|
2023-02-27 09:57:17 +01:00 |
Jose Gonzalez
|
a6f1037c9a
|
Minor fixes or improvements
|
2023-02-24 13:37:47 +01:00 |
|
Pablo Aragon
|
a9d49dea3b
|
10454-Fix filters
|
2023-02-24 10:04:23 +01:00 |
daniel
|
8230ae616b
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/godmode/users/user_list.php
pandora_console/operation/events/events.php
|
2023-02-22 12:35:34 +01:00 |
Matias Didier
|
c6f6a6b9d3
|
Merge branch 'ent-10410-Carga-muy-lenta-de-comentarios-de-eventos-en-tyr-saga' into 'develop'
fixed comment loading in event dialog
See merge request artica/pandorafms!5543
|
2023-02-16 09:34:35 +00:00 |
alejandro.campos@artica.es
|
5c57954b50
|
fixed comment loading in event dialog
|
2023-02-15 19:38:57 +01:00 |
|
Jose Gonzalez
|
d6eedf07aa
|
Merge
|
2023-02-13 10:03:09 +01:00 |
Rafael Ameijeiras
|
2c619540e0
|
Merge branch 'ent-10188-13786-arreglar-filtros-de-alertas-sonoras' into 'develop'
fix filter events sounds pandora_enterprise#10188
See merge request artica/pandorafms!5469
|
2023-02-10 08:03:34 +00:00 |
|
Jose Gonzalez
|
175d4b7341
|
Fixes in Event view and other fixes
|
2023-02-09 16:13:30 +01:00 |
Daniel Cebrian
|
ea789804f4
|
#10190 fixed response option
|
2023-02-07 17:41:27 +01:00 |
|
Daniel Cebrian
|
6117e1741f
|
#10190 added popup for edit events in sound console
|
2023-02-07 16:48:23 +01:00 |
|
Jose Gonzalez
|
0363a90e1f
|
Resolve merge issues
|
2023-01-31 17:35:44 +01:00 |
|
daniel
|
81ae7fdb08
|
fix filter events sounds pandora_enterprise#10188
|
2023-01-27 12:41:06 +01:00 |
|
daniel
|
ddebce7a3c
|
fix validate events pandora_enterprise#10175
|
2023-01-25 11:25:20 +01:00 |
|
Jose Gonzalez
|
a9c4dd625c
|
Merge develop branch
|
2023-01-11 13:46:15 +01:00 |
|
Jose Gonzalez
|
33c9b50ddc
|
Polishing agent detail view
|
2023-01-10 14:57:40 +01:00 |
Jonathan
|
e55d4f3019
|
#9787 Alert general Acknowledged recovery
|
2023-01-05 10:36:14 +01:00 |
|
Jose Gonzalez
|
8421fb49ca
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-01-04 15:54:16 +01:00 |
|
Daniel Barbero
|
b4d306b9b1
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-19 09:38:21 +01:00 |
|
Daniel Barbero
|
a0ddad63b8
|
Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos
Conflicts:
pandora_console/extras/mr/59.sql
|
2022-12-13 09:17:39 +01:00 |
|
Daniel Barbero
|
01d14ae3b8
|
new chart chartjs pandora_enterprise#9554
|
2022-12-13 09:10:13 +01:00 |
|
Rafael Ameijeiras
|
8a6e3e5e06
|
Merge branch 'ent-8854-13786-alertas-sonoras-en-metaconsola' into 'develop'
add sound events to metaconsole pandora_enterprise#8854
See merge request artica/pandorafms!5246
|
2022-12-12 14:02:36 +00:00 |
|
jose.gonzalez@pandorafms.com
|
445a8161cf
|
Merge
|
2022-12-05 09:44:35 +01:00 |
|
jose.gonzalez@pandorafms.com
|
a688182062
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2022-11-22 17:47:02 +01:00 |
Daniel Rodriguez
|
de9eb0551b
|
Merge branch 'ent-9705-14417-pestanas-dentro-de-widget-events-incorrecta-visualizacion' into 'develop'
fix styles events list dashboards pandora_enterprise#9705
See merge request artica/pandorafms!5220
|
2022-11-22 14:03:35 +00:00 |
|
Daniel Barbero
|
d1beb5cb2d
|
fixed filters pandora_enterprise#9864
|
2022-11-22 11:35:38 +01:00 |
|
Daniel Barbero
|
4118a46b9f
|
add new filter search events pandora_enterprise#9135
|
2022-11-18 14:04:54 +01:00 |
|
jose.gonzalez@pandorafms.com
|
f99a7dc511
|
Adaptations
|
2022-11-07 14:04:07 +01:00 |
|
Daniel Barbero
|
ccc2e830f4
|
add sound events to metaconsole pandora_enterprise#8854
|
2022-11-03 15:12:50 +01:00 |
|
Daniel Barbero
|
33b1c0ab8f
|
add new filter pandora_enterprise#9135
|
2022-11-03 12:00:58 +01:00 |
|
Daniel Barbero
|
59f0bba7f3
|
fix styles events list dashboards pandora_enterprise#9705
|
2022-10-27 09:07:04 +02:00 |
|
jose.gonzalez@pandorafms.com
|
00de0faac3
|
Adapted views
|
2022-10-24 19:55:22 +02:00 |
Diego Muñoz-Reja
|
aff8fdb005
|
Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop'
new group by events for extraid pandora_enterprise#9425
See merge request artica/pandorafms!5147
|
2022-10-24 15:19:21 +00:00 |
|
Daniel Barbero
|
47a2e01a33
|
Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya
Conflicts:
pandora_console/extras/mr/58.sql
|
2022-10-18 07:59:26 +02:00 |
|
Diego Muñoz-Reja
|
4c74f1bee7
|
Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop'
fixed response events pandora_enterprise#9423
See merge request artica/pandorafms!5141
|
2022-10-17 10:49:01 +00:00 |
|
Daniel Barbero
|
a21048c4c5
|
Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra
|
2022-10-14 08:11:51 +02:00 |
|
Daniel Barbero
|
8438045cf6
|
filter recursive groups in events pandora_enterprise#2133
|
2022-09-29 12:54:46 +02:00 |
|
Daniel Barbero
|
3dea1f3146
|
filter events multiselector nodes pandora_enterprise#8597
|
2022-09-29 09:17:37 +02:00 |
|
Daniel Barbero
|
8d8140faa4
|
add new macros response events pandora_enterprise#9423
|
2022-09-28 09:30:30 +02:00 |
|
Daniel Barbero
|
9e2c6edfeb
|
new group by events for extraid pandora_enterprise#9425
|
2022-09-27 15:08:09 +02:00 |
|
Daniel Barbero
|
fbce8b7533
|
fixed response events pandora_enterprise#9423
|
2022-09-27 09:51:37 +02:00 |
|
Daniel Barbero
|
225646cd9d
|
fixed response events pandora_enterprise#9423
|
2022-09-23 13:55:01 +02:00 |
Daniel Maya
|
53cbb4d3da
|
#9107 conflict resolved
|
2022-08-29 10:13:39 +02:00 |
|
Daniel Barbero
|
e11d46ea60
|
Merge remote-tracking branch 'origin/develop' into ent-8043-eventos-solo-se-agrupan-si-tienen-el-mismo-estado
Conflicts:
pandora_console/include/ajax/events.php
|
2022-08-01 07:08:00 +02:00 |
|
Daniel Barbero Martin
|
e3e9f86119
|
not group by event status pandora_enterprise#8043
|
2022-07-26 10:55:11 +02:00 |
|
Daniel Barbero Martin
|
bdd9612812
|
fix error custom data show all in tab events pandora_enterprise#9305
|
2022-07-22 10:13:57 +02:00 |
|
Daniel Rodriguez
|
5d674b76b6
|
Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop'
new filter search eventspandora_enterprise#8942
See merge request artica/pandorafms!5007
|
2022-07-21 10:15:49 +00:00 |
|
Diego Muñoz-Reja
|
288e6f3a53
|
Merge branch 'ent-9140-POST-Usuarios-LDAP-no-ven-comentarios-de-eventos-agrupados' into 'develop'
Ent 9140 post usuarios ldap no ven comentarios de eventos agrupados
See merge request artica/pandorafms!4993
|
2022-07-19 13:07:45 +00:00 |
|
Daniel Barbero Martin
|
027f61daff
|
Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos
Conflicts:
pandora_console/extras/mr/56.sql
|
2022-07-19 10:18:04 +02:00 |