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

218 Commits

Author SHA1 Message Date
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
Daniel Rodriguez c3f9ed1bf2 Merge branch 'ent-8042-agrupacion-eventos-no-funcionan-bien-comentarios' into 'develop' 
Added feature for read comments in grouped events

Closes pandora_enterprise#8042

See merge request artica/pandorafms!4467
 2021-12-07 16:51:07 +00:00
Daniel Maya e24987d03e #8201 Fix dashboard event dialog 2021-12-07 12:17:26 +01:00
Jose Gonzalez 3238811f96 Fixed comments issues 2021-12-01 13:15:34 +01:00
Jose Gonzalez 64e08d7124 Fixed grouped comments with id_agent 2021-11-30 10:50:40 +01:00
Jose Gonzalez 7918b883aa Set the last grouped comments to last events fired 2021-11-29 16:12:15 +01:00
Jose Gonzalez 5eb4a869cc Fix issue with metaconsole comments 2021-11-26 11:51:27 +01:00
Jose Gonzalez b151b3996d Fixed issue with events 2021-11-25 13:52:53 +01:00
Calvo 9d3c691ad1 Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-15 18:33:35 +01:00
Calvo 6a2e249af7 Fix missing parameter meta on event comments ajax 2021-10-29 10:23:56 +02:00
Jose Gonzalez 304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
Jose Gonzalez 3f28a98744 Added feature for read comments in grouped events 2021-10-13 14:58:31 +02:00
Jose Gonzalez de1bf03976 Clean logs 2021-09-23 17:19:47 +02:00
Daniel Rodriguez ce40b36923 Merge branch 'ent-7582-anadir-selector-horas-eventos' into 'develop' 
Ent 7582 anadir selector horas eventos

Closes pandora_enterprise#7582

See merge request artica/pandorafms!4266
 2021-09-21 13:17:30 +00:00
Calvo 34c3b00426 WIP: Revision ACL part 3 2021-08-13 15:57:01 +02:00
Daniel Rodriguez 45abf89e6b Merge branch 'ent-7667-12011-bug-de-mostrado-de-comentarios-en-eventos-con-filtrado' into 'develop' 
fixed minnor error when show event comment with filters

See merge request artica/pandorafms!4241
 2021-08-05 11:08:41 +00:00
fbsanchez 056bd1460a Sound alerts only for NEW events found 2021-07-09 14:40:03 +02:00
José González 47b6e40799 Added controls for filter with hours 2021-07-05 17:42:45 +02:00
marcos a225bbdafc fixed minnor error when show event comment with filters 2021-06-28 14:21:45 +02:00
Daniel Maya 8ef21d9b15 Ent 7395 filtro de eventos en metaconsola server 2021-04-28 10:50:04 +00:00
alejandro.campos@artica.es 8f58b74976 fixed filter load in events view 2021-04-21 13:05:18 +02:00
Daniel Rodriguez eeff80638f Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop' 
multiple fixes

See merge request artica/pandorafms!3812
 2021-04-12 10:39:41 +00:00
Daniel Rodriguez 79b11a6b30 Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop' 
Ent 4264 cambios vista de eventos

See merge request artica/pandorafms!3893
 2021-04-12 08:47:13 +00:00
Daniel Rodriguez e54e06b6ac Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop' 
fixed errors sound events

See merge request artica/pandorafms!3916
 2021-04-06 17:11:37 +00:00
daniel 89ffb05466 fixed errors sound events 2021-04-06 17:11:37 +00:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
fbsanchez a3e571ff50 Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect 
Conflicts:
	pandora_console/godmode/users/user_list.php
 2021-03-26 13:52:01 +01:00
Daniel Maya 2f7d0f1795 fixed permissions on response 2021-03-11 16:11:06 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez 0ddc1929fa multiple fixes 2021-02-02 11:25:26 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Rodriguez 946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop' 
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
 2020-10-30 14:42:41 +01:00
daniel c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
marcos 6bcca915ba resuelto el error que vaciaba el module search 2020-10-29 14:57:54 +01:00
marcos cf108c0a17 se cambia el valor del modulo y marca en el filtro usado 2020-10-29 12:30:54 +01:00
marcos edc9038783 Primeras modificaciones del filtro de eventos 2020-10-29 10:24:37 +01:00
Jose Gonzalez 765d7938f9 Handled comments for validated comments 2020-10-23 12:20:20 +02:00
alejandro-campos 0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +02:00
alejandro-campos 90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
Luis Calvo 9a8c42f4ac Fixed xss event comments vulnerabiluty and some acls on event ajax 2020-06-26 15:36:51 +02:00
marcos 7cfc68a3d6 ignore keys on xss event comments 2020-06-19 10:59:43 +02:00
marcos 93bc14d102 fixed vulnerabilty on events comments 2020-06-09 11:40:39 +02:00
Daniel Maya 8ae8ac45f5 Ent 5690 vulnerabilidad critica inyeccion de comandos en llamada a event response 2020-04-15 15:50:08 +02:00
alejandro-campos 0f1ed5165e default timeout for IPAM ping 2020-03-17 18:03:08 +01:00
Alejandro Campos c389769602 Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-15 17:12:32 +01:00
alejandro-campos 5eb2953810 Added port option on server configuration to be used when connecting to execution server 2020-01-14 15:43:17 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Daniel Maya bb4fce07a1 Added secondary groups in event details 2019-12-11 12:35:27 +01:00
Daniel Rodriguez 1350ef951b Merge branch '5079-Otra-vez-las-comillas-dobles-en-comentarios' into 'develop' 
Code reset and solved other issues with comments

See merge request artica/pandorafms!2943
 2019-12-10 17:21:48 +01:00
Luis 6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +01:00
vgilc f55a5c484e Merge branch 'ent-4961-Ventana-filtro-de-eventos-muy-pequeña-si-el-nombre-de-filtro-es-muy-grande' into 'develop' 
Ent 4961 ventana filtro de eventos muy pequeña si el nombre de filtro es muy grande

See merge request artica/pandorafms!2880
 2019-12-10 11:35:41 +01:00
Jose Gonzalez 3652f31a18 Code reset and solved other issues with comments 2019-12-05 17:06:58 +01:00
marcos 21bf49c218 update id_source_event 2019-11-22 13:38:08 +01:00
Tatiana Llorente a11b18292c Fixed width in the select to load filters in events view 2019-11-12 17:12:44 +01:00
Daniel Barbero Martin 31da17db03 fixed event view metaconsole 2019-08-22 14:27:45 +02:00
Daniel Barbero Martin 45e1c32473 fixed events sound 2019-07-15 15:31:01 +02:00
Tatiana Llorente 1f8e143963 Fixed bug to change the event status in modal window - #4309 2019-07-10 13:04:06 +02:00
fbsanchez 526ebdebd9 ajax comments 2019-06-20 21:11:56 +02:00
fbsanchez 8671c7c88c events qa adjustments 2019-06-20 19:23:13 +02:00
fbsanchez 2c5cd007d2 reset form on load filter none 2019-06-20 14:18:49 +02:00
fbsanchez 44d8b977cb event advanced filter fixes 2019-06-19 16:52:14 +02:00
fbsanchez 8b8d17f089 event ajax validation little improvement 2019-06-18 18:35:34 +02:00
fbsanchez c3ebe88178 style review 2019-06-18 17:40:31 +02:00
fbsanchez 22272225b8 massive operations over events 2019-06-18 14:26:55 +02:00
fbsanchez dc81d168e0 event filters group selectors 2019-06-18 11:00:48 +02:00
fbsanchez 457c1c9edf wip event view 2019-06-17 18:33:39 +02:00
fbsanchez ab7d72a1c9 wip event vwr ui-box close tick 2019-06-17 17:02:33 +02:00
fbsanchez 36a1387632 WIP event show info 2019-06-14 19:23:04 +02:00