Jonathan
|
a48c496e14
|
#11822 fix sound events window
|
2023-08-03 12:22:35 +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 |
|
Jonathan
|
5f8c2f1653
|
#11628 merge conflict solution
|
2023-07-03 09:34:04 +02:00 |
|
Rafael Ameijeiras
|
d082687c44
|
Merge branch 'ent-10020-Eliminar-login-hash-de-vistas-metaconsola' into 'develop'
Ent 10020 eliminar login hash de vistas metaconsola
See merge request artica/pandorafms!5839
|
2023-06-29 09:55:53 +00:00 |
|
Rafael Ameijeiras
|
3c87f090d5
|
Merge branch 'ent-9928-Entrecomillar-campos-en-exportacion-CSV-para-la-vista-de-eventos' into 'develop'
wrap csv fields with string delimiter on export
See merge request artica/pandorafms!5854
|
2023-06-29 09:49:29 +00:00 |
|
alejandro.campos@artica.es
|
1225c055a1
|
removed hash in url from agent id link
|
2023-06-28 09:35:49 +02:00 |
|
Rafael Ameijeiras
|
7fd836d8de
|
Merge branch 'ent-11503-campo-comments-ocupa-mucho-para-lo-que-muestra-eventos' into 'develop'
Ent 11503 campo comments ocupa mucho para lo que muestra eventos
See merge request artica/pandorafms!6158
|
2023-06-27 11:22:44 +00:00 |
|
miguel angel rasteu
|
f33e569e7b
|
#11503 Fix event class
|
2023-06-26 17:09:38 +02:00 |
|
Matias Didier
|
fde3857674
|
Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'
Ent 11476 cambiar headers de copyright
See merge request artica/pandorafms!6069
|
2023-06-22 13:24:47 +00:00 |
|
miguel angel rasteu
|
36ee57ce65
|
#11503 Fix td comment width
|
2023-06-21 10:43:28 +02:00 |
|
Jonathan
|
5224b0e9d0
|
#11625 Events - icons event type
|
2023-06-20 14:35:33 +02:00 |
Jorge Rincon
|
f153e59caf
|
#11538 Fixed styles for the Discovered alerts tab
|
2023-06-14 13:51:21 +02:00 |
|
Jorge Rincon
|
eea9a9e47b
|
#11538 Fixed styles for dark theme
|
2023-06-13 09:12:32 +02:00 |
|
miguel angel rasteu
|
db62a91cb6
|
#11476 Fix https url
|
2023-06-08 13:19:01 +02:00 |
|
miguel angel rasteu
|
1f8752ee63
|
#11476 Fix pandora url
|
2023-06-08 13:10:16 +02:00 |
|
miguel angel rasteu
|
64204b6ff7
|
#11476 Fix ascci art
|
2023-06-08 12:42:10 +02:00 |
|
miguel angel rasteu
|
933f69f2ab
|
#11476 Change copyright header
|
2023-06-08 11:53:13 +02:00 |
|
miguel angel rasteu
|
4b4e2b0266
|
#10875 add mw250px to comment column
|
2023-06-05 16:05:38 +02:00 |
Daniel Cebrian
|
eb1e28ce7d
|
#11280 fixed acoustic console name
|
2023-05-30 17:18:58 +02:00 |
|
Daniel Cebrian
|
2a7eb1e069
|
#11280 fixed acoustic console name
|
2023-05-30 17:17:34 +02:00 |
|
miguel angel rasteu
|
33d95ef00e
|
#11117 Add new field in tusuario for metaconsole event default and fix selectors
|
2023-05-22 12:08:27 +02:00 |
|
alejandro.campos@artica.es
|
e0090aee95
|
wrap csv fields with string delimiter on export
|
2023-05-08 14:47:22 +02:00 |
|
Pablo Aragon
|
886bde919b
|
11135-Move js code from ui_print_datatable
|
2023-05-08 14:25:57 +02:00 |
|
alejandro.campos@artica.es
|
4cac880eca
|
send login hash info in post body in meta links to node
|
2023-05-05 13:04:02 +02:00 |
|
daniel
|
e77a63a91f
|
fix select2 pandora_enterprise#11110
|
2023-05-04 12:57:01 +02:00 |
Daniel Rodriguez
|
06b58d3dfc
|
Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop'
Ent 10191 nuevas alertas sonoras son poco usables
See merge request artica/pandorafms!5689
|
2023-04-28 06:04:18 +00:00 |
|
Jonathan
|
f5c517ae7d
|
#10191 event sound fix select2
|
2023-04-21 09:30:22 +02:00 |
|
Pablo Aragon
|
9e124933b0
|
10886-Confict
|
2023-04-18 10:42:37 +02:00 |
|
Pablo Aragon
|
bd4066c690
|
10886-Timestamp events with ui_print_timestamp()
|
2023-04-17 15:43:53 +02:00 |
|
Daniel Rodriguez
|
895b1bea7c
|
Merge branch 'ent-10945-timestamp-desconocido-en-vista-de-eventos' into 'develop'
Ent 10945 timestamp desconocido en vista de eventos
See merge request artica/pandorafms!5717
|
2023-04-13 14:53:45 +00:00 |
|
Daniel Maya
|
a8277dc19f
|
#10945 Fix timestamp
|
2023-04-13 12:25:18 +02:00 |