tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,286 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

285 Commits

Author SHA1 Message Date
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
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
Daniel Maya 987678b339 #9107 Fixed filter event 2022-07-15 11:38:46 +02:00
Daniel Barbero Martin 12f73d86fd new filter search eventspandora_enterprise#8942 2022-07-05 17:02:40 +02:00
Daniel Barbero Martin 033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Barbero Martin 2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Daniel Barbero Martin e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Daniel Maya 43b2a3d47e #9140 Fixed comments 2022-06-29 15:34:09 +02:00
Daniel Barbero Martin 1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/functions_events.php
 2022-06-27 16:07:19 +02:00
Daniel Barbero Martin f89aaabc21 minor fixed events 2022-06-23 18:06:25 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Barbero Martin 8e7ed75b3e refactor events meta pandora_enterprise#9086 2022-06-16 11:31:07 +02:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin b82b3c3fb1 refactor events meta pandora_enterprise#9086 2022-06-14 18:47:09 +02:00
Daniel Barbero Martin 5968febd04 Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2022-06-13 17:10:19 +02:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Barbero Martin 1cd680a971 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 
Conflicts:
	pandora_console/operation/events/events.php
 2022-06-03 09:28:18 +02:00
Daniel Barbero Martin 0cda3d3613 refactor events meta pandora_enterprise#9086 2022-06-01 17:27:44 +02:00
Daniel Barbero Martin f6de9fb0a0 events sound pandora_enterprise#7960 2022-05-31 10:10:44 +02:00
Daniel Barbero Martin 8e78110d5d events sound pandora_enterprise#7960 2022-05-30 17:47:28 +02:00
Daniel Maya 4a6ab6ce95 #8766 Fixed event comments 2022-04-04 16:02:26 +02:00
alejandro.campos@artica.es 3042755e70 Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' of brutus.artica.es:artica/pandorafms into ent-8340-POST-Custom-data-en-vista-de-eventos 2022-04-01 14:07:31 +02:00
alejandro.campos@artica.es b7aca968a3 minor change 2022-04-01 14:06:51 +02:00
Alejandro Campos 3e5865b539 Merge branch 'develop' into 'ent-8340-POST-Custom-data-en-vista-de-eventos' 
# Conflicts:
#   pandora_console/extras/mr/53.sql
 2022-03-30 08:03:08 +00:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
Calvo 4109d94853 Fix events dashboard user owner entities 2022-03-25 14:07:44 +01:00
Calvo 5e6bdaeb15 Fix events dashboard user owner entities 2022-03-25 14:05:38 +01:00
Calvo 6ed8851188 Fix event list widget actions on dashboard 2022-03-24 18:52:06 +01:00
Calvo 174f6dce51 Fix dashboard event list, Removed missing debugger in code 2022-03-22 18:02:53 +01:00
Luis ba6a56b9fc WIP: event dashboard responses 2022-03-21 18:15:58 +01:00
Calvo 6dc775649d Fix dashboard events responses 2022-03-14 15:29:40 +01:00
José González fc4b702db0 Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' 
# Conflicts:
#   pandora_console/godmode/alerts/configure_alert_template.php
 2022-02-08 11:35:01 +00:00
alejandro.campos@artica.es 74c2dafed0 added token to display or hide command in event response execution 2022-02-01 14:30:25 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Rodriguez 3ec6ba0e6d Merge branch 'ent-8201-Bug-en-widget-latest-events-Dashboard-metaconsola' into 'develop' 
Ent 8201 bug en widget latest events dashboard metaconsola

See merge request artica/pandorafms!4571
 2021-12-23 12:11:08 +00:00