287 Commits

Author SHA1 Message Date
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
Pablo Aragon
3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
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
Jonathan
34fede2ce1 #9819 New section configuration sound event 2023-01-27 12:42:23 +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