Commit Graph

516 Commits

Author SHA1 Message Date
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02: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 ed6fa1a803 Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop'
dashboards meta

See merge request artica/pandorafms!3840
2021-04-07 10:53:31 +00:00
Daniel Rodriguez 859c174c1b Merge branch 'ent-7093-Item-group-event-report-chequea-tabla-incorrecta' into 'develop'
fixed error events reports

See merge request artica/pandorafms!3902
2021-04-06 16:59:42 +00:00
Marcos Alconada 654a4ebbd0 remove entities when add comment 2021-04-06 16:58:05 +00:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola'
Conflicts:
   pandora_console/include/functions_html.php
2021-03-31 10:12:36 +00:00
Marcos Alconada 9e1bacb66e fixed visual error 2021-03-29 07:23:03 +00:00
fbsanchez c3232b0f2a Merge remote-tracking branch 'origin/develop' into ent-7010-nexcon-mejoras-widget-de-eventos
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
2021-03-24 09:55:31 +01:00
Daniel Barbero Martin bf4710ba93 fixed error events reports 2021-03-15 13:26:29 +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
Daniel Rodriguez 4996be48dc Merge branch 'ent-6966-No-se-ve-fecha-validacion' into 'develop'
Fixed issue with date

Closes pandora_enterprise#6966

See merge request artica/pandorafms!3818
2021-03-09 16:37:34 +00:00
Jose Gonzalez c235cfb01a Fixed 2021-03-08 08:21:45 +01:00
Daniel Rodriguez 23cddae261 Merge branch 'ent-5229-filtro-event-report' into 'develop'
Added string exclude filter to events reports

See merge request artica/pandorafms!3748
2021-03-01 15:28:18 +00:00
fbsanchez ef16ef4281 Dashboards in metaconsole 2021-02-18 12:47:42 +01:00
fbsanchez 0be3e0ab90 Event widget and some notices fixed 2021-02-10 15:00:23 +01:00
Jose Gonzalez aee474e43c Fixed issue with date 2021-02-04 14:54:11 +01:00
fbsanchez d171e805b5 alerts criticity in event response to retrieve event_instructions 2021-02-03 14:26:45 +01:00
fbsanchez 93908626a0 Merge remote-tracking branch 'origin/develop' into ent-6665-axa-datos-heredados-en-evento-alert-fired 2021-02-03 13:32:54 +01:00
fbsanchez 3b0319cecc event responses including alerts 2021-02-03 11:16:20 +01:00
fbsanchez 0b15f27699 minor CDE 2021-02-02 16:22:17 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
Luis Calvo df9bc6198d Added string exclude filter to events reports 2020-12-29 12:04:09 +01:00
fbsanchez 6461f029ee Added macros to event response 2020-12-10 17:53:49 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez fe7ad1471a Fix 2020-11-26 16:46:27 +01:00
Jose Gonzalez 86d2290961 Solve issue 2020-11-13 14:53:31 +01:00
daniel c4e7c6b5f1 fix events acknowledge-by 2020-10-30 14:42:10 +01:00
daniel b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
Daniel Rodriguez a047ca8181 Merge branch 'ent-6576-macros-de-respuestas-de-eventos-que-no-funcionan' into 'develop'
fixes in event macros (responses)

See merge request artica/pandorafms!3560
2020-10-30 11:32:09 +01:00
fbsanchez 2376ef408b Update functions_events.php resolve entities for group_name in event responses 2020-10-30 11:22:39 +01:00
Daniel Rodriguez fe90008d17 Merge branch 'ent-6587-bug-historico-comentarios-eventos' into 'develop'
Handled comments for validated comments

Closes pandora_enterprise#6587

See merge request artica/pandorafms!3564
2020-10-30 10:46:52 +01:00
Daniel Rodriguez e0b0ab8b42 Merge branch 'ent-6579-Faltan-macros-de-agente-en-respuestas-de-eventos' into 'develop'
Ent 6579 faltan macros de agente en respuestas de eventos

See merge request artica/pandorafms!3562
2020-10-29 18:17:22 +01:00
fbsanchez c4d9c0851a safe output in _event_date_ (custom responses) 2020-10-29 18:08:02 +01:00
fbsanchez b92cfc6c10 Merge remote-tracking branch 'origin/develop' into ent-6576-macros-de-respuestas-de-eventos-que-no-funcionan 2020-10-29 18:00:17 +01:00
Daniel Maya 43ca5e4972 Ent 6482 fallo en la agrupación de eventos 2020-10-29 12:53:09 +01:00
fbsanchez 8b4bcc77ab Update functions_events.php (io_safe_output over _event_date_) 2020-10-27 13:56:38 +01:00
Jose Gonzalez 765d7938f9 Handled comments for validated comments 2020-10-23 12:20:20 +02:00
alejandro-campos 5d812d5859 added new macros 2020-10-23 09:20:23 +02:00
fbsanchez 75bb4338b7 fixes in event macros (responses) 2020-10-22 18:10:46 +02:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
fbsanchez 0deff70f8b Alert report (group) Group + secondary groups + recursion 2020-10-07 14:07:17 +02:00
fbsanchez ff8aaf18fe Group event reports (with secondary groups) 2020-10-06 15:48:12 +02:00
fbsanchez cc3189196c Fix secondary groups match while group filtering 2020-10-05 12:45:26 +02:00
Daniel Rodriguez 1cdb91a02d Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop'
Custom id improvements

See merge request artica/pandorafms!3464
2020-10-02 13:07:59 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez b07d24ed25 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
	pandora_console/include/functions_api.php
	pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
fbsanchez ca8683dd22 removed traces 2020-09-18 11:51:31 +02:00
fbsanchez 696b58544c fixes 2020-09-18 11:47:50 +02:00
fbsanchez 92da78496b Added module custom id to general tab in event details 2020-09-17 16:54:40 +02:00
fbsanchez bc166dfba2 module custom id in event list + minor fixes 2020-09-17 16:51:23 +02:00
Jose Gonzalez aecbab5c36 Fix variable type for array_flip instruction 2020-09-07 14:13:53 +02:00
Daniel Rodriguez 50cba7936a Revert "Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'"
This reverts merge request !3311
2020-07-21 14:03:17 +02:00
Daniel Rodriguez 3ad555048f Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'
fix vulnerability

See merge request artica/pandorafms!3311
2020-07-21 14:00:07 +02:00
Daniel Rodriguez d6fc3a6195 Merge branch 'ent-5967-botones-de-events-responses-no-son-iguales' into 'develop'
fixed visual style repsonse buttons

See merge request artica/pandorafms!3319
2020-07-16 12:16:57 +02:00
Daniel Rodriguez 47686f2f51 Merge branch 'ent-5618-bug-en-nombres-de-los-usuarios-en-el-owner-de-eventos' into 'develop'
Change owner event responses

See merge request artica/pandorafms!3294
2020-07-13 11:12:02 +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 1b0d40f88a fixed visual style repsonse buttons 2020-06-18 16:16:37 +02:00
alejandro-campos 98b358e7ad fix vulnerability 2020-06-16 17:27:53 +02:00
marcos ea6578f534 Change owner event responses 2020-06-09 17:42:44 +02:00
alejandro-campos f22cc5b22b add owner when validate event 2020-06-09 11:54:02 +02:00
alejandro-campos d6ac646046 fixed bug: update owner_user when validating an event 2020-04-21 17:57:36 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Daniel Maya 11324af76a Fixed tags_without 2020-03-23 13:13:45 +01:00
Tatiana Llorente 6dd1ee24e5 Merge remote-tracking branch 'origin/develop' into ent-4771-Revision-llamada-API-create-event-en-metaconsola 2020-02-10 16:48:38 +01:00
Daniel Rodriguez 97adbca5cd Merge branch 'ent-4768-error-macro-agent-address-event-responses' into 'develop'
Fixed macro agent address empty ip

See merge request artica/pandorafms!2823
2020-02-05 12:56:13 +01:00
alejandro-campos 5913f815d1 Added possibility to display comments with line breaks in event detail 2020-01-27 13:37:34 +01:00
Daniel Rodriguez 587e53dbd0 Merge branch 'ent-5259-Cambiar-estado-In-process-de-evento-no-añade-comentario' into 'develop'
Ent 5259 cambiar estado in process de evento no añade comentario

See merge request artica/pandorafms!3009
2020-01-14 08:36:43 +01:00
Daniel Maya 7204e7c0f2 Ent 4862 mas opciones en los filtros de severidad 2020-01-13 18:24:29 +01:00
Tatiana Llorente 40a86384c2 Add comment in events when status is changed 2020-01-13 13:00:43 +01:00
Daniel Rodriguez 1cef8aa62f Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
Changed the mode of obtain the title

See merge request artica/pandorafms!2743
2020-01-09 16:46:58 +01:00
Alejandro Fraguas f0848d4feb Merge branch 'ent-4993-Diferentes-bugs-tiempos' into 'develop'
Changed date format to last remote contact

See merge request artica/pandorafms!2898
2019-12-24 11:48:25 +01:00
Daniel Maya bb4fce07a1 Added secondary groups in event details 2019-12-11 12:35:27 +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
marcos ab1a64a2e6 Merge remote-tracking branch 'origin/develop' into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-11-22 10:56:36 +01:00
marcos de3f8b2a0f updates 2019-11-22 10:56:30 +01:00
Marcos Alconada 34cdcdfd6e Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
#   pandora_console/extras/mr/29.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
#   pandora_console/include/functions_events.php
2019-11-21 10:13:00 +01:00
Daniel Maya fad70cfdc0 fixed secondary group in events 2019-11-20 16:34:56 +01:00
Tatiana Llorente bae61d4225 Changed date format to last remote contact 2019-11-20 10:30:22 +01:00
Jose Gonzalez 62fbdd36a0 Solution for lost comments in the events section modal window 2019-11-13 15:36:52 +01:00
Luis Calvo 5676872f0a Fixed macro agent address empty ip 2019-10-18 15:44:05 +02:00
Alejandro Fraguas 78610b127c Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop'
Ent 4682 comentarios en eventos no se ven en metaconsola

See merge request artica/pandorafms!2775
2019-10-15 11:42:00 +02:00
Tatiana Llorente 7b862429af Change defined metaconsole to is_metaconsole function in api - #4771 2019-10-08 15:28:35 +02:00
Daniel Rodriguez debbbdc4e5 Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop'
Improved truncate system and solved issue

See merge request artica/pandorafms!2774
2019-10-07 13:49:57 +02:00
Jose Gonzalez 7ac12e45ef Solved visual issue 2019-10-07 13:33:18 +02:00
marcos.alconada a7b66e6365 revert changes 2019-10-07 12:07:31 +02:00
marcos.alconada a9e8b1113e add default comments when change owner or status on events 2019-10-07 11:15:25 +02:00
Kike b25c9ca793 Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos
Conflicts:
	pandora_console/include/functions_events.php
2019-10-03 15:59:15 +02:00
marcos.alconada a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
Kike dfea704154 Show instructions on mouse over 2019-09-27 14:48:45 +02:00
alejandro-campos a5ea095734 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria 2019-09-24 15:16:22 +02:00
Kike 4ae14e0888 Fixed issue with instructions in events view 2019-09-24 15:14:17 +02:00
manuel b7ff7bc121 Fixed bug in report items 2019-09-23 15:27:06 +02:00
alejandro-campos 0df2447770 added comment management and fixed some errors in incident edition 2019-09-20 12:37:47 +02:00
Jose Gonzalez d7ca703c99 Cleaned the javascript call 2019-09-20 10:53:09 +02:00
Tatiana Llorente ca6fe42298 Merge remote-tracking branch 'origin/ent-4461-Configuracion-integracion-integria' into ent-4642-Listado-de-tickets-integración-Integria 2019-09-13 12:00:04 +02:00
alejandro-campos 11cb53582c backup changes 2019-09-02 17:01:41 +02:00
Daniel Rodriguez c47b24d84c Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop'
Fixed bug permissions on filter events- 4278

See merge request artica/pandorafms!2671
2019-08-30 16:07:45 +02:00