Commit Graph

465 Commits

Author SHA1 Message Date
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