alejandro.campos@artica.es
|
1991b74b9b
|
Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query
|
2024-02-21 10:05:11 +01:00 |
|
alejandro.campos@artica.es
|
df7435132a
|
change regex search in events
|
2024-02-16 10:10:38 +01:00 |
|
Daniel Cebrian
|
e5139436ab
|
#12877 fixed reload comments
|
2024-02-12 17:19:50 +01:00 |
|
Jonathan
|
644308db4f
|
#12845 fix style hover
|
2024-02-06 14:34:34 +01:00 |
|
Daniel Cebrian
|
5d5bfc654d
|
#12753 fixed os command injection
|
2024-01-22 12:39:43 +01:00 |
|
Jonathan
|
49784cab5a
|
Merge branch 'develop' into ent-12202-eastern-egg-asteroids
|
2024-01-17 09:29:21 +01:00 |
|
daniel
|
af99c10b19
|
fix events sound pandora_enterprise#12607
|
2023-12-13 13:03:58 +01:00 |
|
daniel
|
34784752b7
|
fix error js load modal filter sound events pandora_enterprise#12607
|
2023-12-05 11:47:37 +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 |
|
Matias Didier
|
8cfb0353dd
|
Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop'
fix sound alerts severity filter pandora_enterprise#12378
See merge request artica/pandorafms!6663
|
2023-11-30 11:41:30 +00:00 |
|
Jonathan
|
f86a3e60e8
|
#11763 save filter regex on bbdd
|
2023-11-29 11:14:40 +01:00 |
|
daniel
|
730cfb30ff
|
Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-11-28 08:40:07 +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 |
|
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 |
|
Jonathan
|
4f707a5a1b
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-23 09:27:46 +01:00 |
|
Jorge Rincon
|
b6582b7f7e
|
#12202 added Asteroids game
|
2023-11-22 13:30:44 +01:00 |
|
daniel
|
0aece464f8
|
fix sound alerts severity filter pandora_enterprise#12378
|
2023-11-14 13:38:09 +01:00 |
|
Daniel Maya
|
287b983ce9
|
#12371 Fixed events
|
2023-11-02 15:39:55 +01: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 |
|
Calvo
|
0b4ee35780
|
Fix query agent events
|
2023-09-27 11:01:21 +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
|
764d5908bb
|
Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados
|
2023-09-11 10:58:37 +02:00 |
|
Calvo
|
a8a201cf19
|
Agents show events 24h switch checked default
|
2023-09-04 16:47:01 +02:00 |
|
Jorge Rincon
|
797b24af86
|
#10065 Added switch to filter create/edit modal.
|
2023-08-28 13:54:35 +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
|
3429e0d190
|
#10065 Added the option to create-edit a private event filter.
|
2023-08-07 14:43:50 +02:00 |
|
Daniel Maya
|
ad24712eed
|
resolved conflict 2
|
2023-07-31 09:48:42 +02:00 |
|
miguel angel rasteu
|
2b20b7f8ee
|
#11386 Fix modal
|
2023-07-27 10:47:51 +02:00 |
|
miguel angel rasteu
|
5084c0490b
|
#11386 Fix changes in soun event dialog
|
2023-07-21 13:32:12 +02:00 |
|
daniel
|
d3412a7ad1
|
add filter events comments pandora_enterprise#11387
|
2023-07-10 16:26:33 +02:00 |
|
daniel
|
200750f90b
|
change events user_comment new table tevent_comment pandora_enterprise#11387
|
2023-07-07 12:53:14 +02:00 |
|
Daniel Cebrian
|
adb7c33863
|
#10870 changed status from view details views when is agruped by extraid
|
2023-06-26 17:05:46 +02:00 |
|
Rafael Ameijeiras
|
7065d8bb4d
|
Merge branch 'ent-11550-widget-tactical-view-muestra-todos-los-datos-en-algunas-partes-aun-filtrando-por-grupo' into 'develop'
Ent 11550 widget tactical view muestra todos los datos en algunas partes aun filtrando por grupo
See merge request artica/pandorafms!6096
|
2023-06-26 07:35:24 +00:00 |
|
miguel angel rasteu
|
5d4f90ca10
|
#11550 Fix tactical view widget
|
2023-06-21 16:10:13 +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 |
|
Jonathan
|
3a96c60bac
|
#10191 new event sound modal
|
2023-04-11 13:50:11 +02:00 |
|
Pablo Aragon
|
b3becfc861
|
10889-500 acustic console
|
2023-04-11 10:06:47 +02:00 |
|
Pablo Aragon
|
5969928003
|
10408-Fix action column & 10398-Events pure mode
|
2023-03-28 12:39:02 +02:00 |
|
Rafael Ameijeiras
|
4535fb85a3
|
Merge branch 'ent-10568-14584-Comentarios-no-mostrados-en-eventos' into 'develop'
fixes in event comments
See merge request artica/pandorafms!5591
|
2023-03-22 17:05:54 +00:00 |
|
alejandro.campos@artica.es
|
5148dcdaef
|
fixes in event comments
|
2023-03-09 17:17:54 +01:00 |
|
Pablo Aragon
|
2a97b26cfe
|
Admin tools
|
2023-03-09 15:14:47 +01:00 |
|
Pablo Aragon
|
6ae86b4c39
|
Sound events. Login SAML
|
2023-03-06 08:21:04 +01:00 |
|
daniel
|
5d7738a05e
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/extras/mr/62.sql
pandora_console/include/ajax/module.php
pandora_console/include/functions_ui.php
pandora_console/operation/agentes/estado_agente.php
pandora_console/operation/agentes/status_monitor.php
pandora_console/operation/events/events.php
|
2023-03-03 08:20:44 +01:00 |
|
Jonathan
|
fdab2cff8e
|
Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos
|
2023-03-02 08:26:53 +01:00 |
|