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 |
Jonathan
|
98388bb7d2
|
#12286 fix dashboard vulnerability login admin
|
2023-10-19 17:06:01 +02:00 |
Rafael Ameijeiras
|
2451eaff62
|
Merge branch 'ent-12073-consola-sonora-no-funciona-si-la-pestana-se-minimiza' into 'develop'
Ent 12073 consola sonora no funciona si la pestana se minimiza
See merge request artica/pandorafms!6495
|
2023-10-17 12:25:58 +00:00 |
Daniel Cebrian
|
a02482ac5d
|
#10194 added links
|
2023-10-10 15:15:43 +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
|
27bee15d50
|
#12172 Change truncate event name limit to description_size_text
|
2023-10-04 12:56:28 +02: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 |
|
Diego Muñoz-Reja
|
b84ffc124b
|
Merge branch 'ent-12066-eventos-que-no-muestran-los-comentarios' into 'develop'
fix show comment events ticket pandora_enterprise#12066
See merge request artica/pandorafms!6488
|
2023-09-28 14:06:30 +00:00 |
|
Daniel Cebrian
|
62d501e6d5
|
#10194 sections Alerts and Events
|
2023-09-27 13:30:56 +02:00 |
|
miguel angel rasteu
|
550bd0e6ba
|
#12073 Add tip
|
2023-09-25 15:39:48 +02:00 |
daniel
|
c6a04d5d8f
|
fix show comment events ticket pandora_enterprise#12066
|
2023-09-22 12:56:01 +02:00 |
|
Jonathan
|
fcefe5a225
|
#12044 fix acoustic console open error 500
|
2023-09-20 12:07:19 +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 |
|
miguel angel rasteu
|
91aee79ab2
|
#12037 Resolve conflicts
|
2023-09-12 15:07:00 +02:00 |
|
miguel angel rasteu
|
fddf204a1b
|
#10676 Fix module text size
|
2023-09-11 15:18:25 +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 |
|
miguel angel rasteu
|
99f92b9bec
|
#10676 Fix truncate text
|
2023-09-11 10:09:34 +02:00 |
|
Jorge Rincon
|
ba1a3da03a
|
#10065 fixed checkbox switch style
|
2023-09-04 10:03:53 +02:00 |
Gorka Sanchez
|
7dcb38f382
|
Merge branch 'ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios' into 'develop'
Ent 11821 error sql en vista de eventos al agregar columna de comentarios
See merge request artica/pandorafms!6359
|
2023-09-01 09:24:10 +00:00 |
|
Jorge Rincon
|
797b24af86
|
#10065 Added switch to filter create/edit modal.
|
2023-08-28 13:54:35 +02:00 |
Pablo Aragon
|
cd430f9f3f
|
11952-Fix filters in List of latest events
|
2023-08-28 12:27:45 +02:00 |
|
Pablo Aragon
|
9271dc33f1
|
11821-Events not sort by comments
|
2023-08-24 14:43:05 +02:00 |
|
Rafael Ameijeiras
|
82389ddf2d
|
Merge branch 'ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento' into 'develop'
Ent 10870 [#15385] Limpiar eventos desde la vista detallada de evento
See merge request artica/pandorafms!6174
|
2023-08-21 11:10:35 +00:00 |
|
Daniel Cebrian
|
dd5a4887a2
|
#10870 fixed change status from event
|
2023-08-18 14:14:51 +02:00 |
|
Jorge Rincon
|
3e4178c490
|
Merge branch develop into ent-10065-post-filtros-de-eventos-privados
|
2023-08-18 09:19:57 +02:00 |
|
Rafael Ameijeiras
|
be7489ee93
|
Merge branch 'ent-9601-14239-Exportar-eventos-en-CSV-no-usa-la-TZ-del-usuario' into 'develop'
use user configured timezone for event export
See merge request artica/pandorafms!6307
|
2023-08-18 06:45:22 +00:00 |
|
Jorge Rincon
|
3429e0d190
|
#10065 Added the option to create-edit a private event filter.
|
2023-08-07 14:43:50 +02:00 |
|
Jonathan
|
a48c496e14
|
#11822 fix sound events window
|
2023-08-03 12:22:35 +02:00 |
alejandro.campos@artica.es
|
1fde2ed9b1
|
use user configured timezone for event export
|
2023-08-03 11:03:56 +02:00 |
Daniel Maya
|
ad24712eed
|
resolved conflict 2
|
2023-07-31 09:48:42 +02:00 |
|
Daniel Maya
|
8bbaa11ce3
|
resolved conflict
|
2023-07-31 09:44:46 +02:00 |
|
Daniel Maya
|
858a6230b3
|
resolved conflict
|
2023-07-31 09:02:58 +02:00 |
|
Rafael Ameijeiras
|
6db5b41633
|
Merge branch 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' into 'develop'
Ent 10875 15383 limitar ancho y o largo de la linea de los eventos
See merge request artica/pandorafms!6034
|
2023-07-31 06:40:38 +00:00 |
|
miguel angel rasteu
|
539dd0ddee
|
#10875 Fix title dialog event
|
2023-07-28 13:07:04 +02:00 |
|
miguel angel rasteu
|
b4ae714af3
|
#10875 Truncate long string
|
2023-07-28 10:39:46 +02:00 |
|
alejandro.campos@artica.es
|
6114787764
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-27 13:32:26 +02:00 |
|
miguel angel rasteu
|
2b20b7f8ee
|
#11386 Fix modal
|
2023-07-27 10:47:51 +02:00 |
|
miguel angel rasteu
|
a1965de2ea
|
#11386 Fix sound alert modal
|
2023-07-24 12:25:06 +02:00 |
|
Pablo Aragon
|
ccf124103d
|
11135-Move js code from ui_print_datatable. Resolve conflict
|
2023-07-24 10:46:19 +02:00 |
|
miguel angel rasteu
|
5084c0490b
|
#11386 Fix changes in soun event dialog
|
2023-07-21 13:32:12 +02:00 |
|
daniel
|
c520375c61
|
ack utimestamp pandora_enterprise#11387
|
2023-07-19 13:28:53 +02:00 |
|
daniel
|
1f1b85561c
|
Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id
|
2023-07-19 11:39:06 +02:00 |
|
Miguel Angel Rasteu
|
c428a7d69c
|
Merge branch 'develop' into 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos'
# Conflicts:
# pandora_console/operation/events/events.php
|
2023-07-17 08:45:28 +00:00 |
|
daniel
|
d3412a7ad1
|
add filter events comments pandora_enterprise#11387
|
2023-07-10 16:26:33 +02:00 |
|
miguel angel rasteu
|
14819e045e
|
#11649 Fix event widget
|
2023-07-10 09:04:07 +02:00 |
|
daniel
|
200750f90b
|
change events user_comment new table tevent_comment pandora_enterprise#11387
|
2023-07-07 12:53:14 +02:00 |
|
miguel angel rasteu
|
444dbb4599
|
#11386 Fix modal event sound
|
2023-07-06 13:15:45 +02:00 |
Matias Didier
|
5dee7f6d28
|
Merge branch 'ent-11625-los-iconos-del-tipo-de-evento-son-todo-cubos-de-colores' into 'develop'
Ent 11625 los iconos del tipo de evento son todo cubos de colores
See merge request artica/pandorafms!6150
|
2023-07-05 07:25:55 +00:00 |
|
Jonathan
|
11bc45ff02
|
#11625 fix style event type icon
|
2023-07-03 12:13:27 +02:00 |