731 Commits

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