Commit Graph

780 Commits

Author SHA1 Message Date
Enrique Martin aff3726269 Merge branch 'ent-13737-modo-interpretar-enlaces' into 'develop'
Ent 13737 modo interpretar enlaces

See merge request artica/pandorafms!7405
2024-05-28 17:49:15 +00:00
Matias Didier 6c58a0e55e Merge branch 'ent-13783-macro-_event_id_-no-esta-mostrando-id-del-evento' into 'develop'
Ent 13783 macro  event id  no esta mostrando id del evento

See merge request artica/pandorafms!7416
2024-05-24 13:53:00 +00:00
Jonathan 23282e0ca3 #13783 fix macros 2024-05-24 11:39:53 +02:00
Jonathan 61040b7991 #13783 fix conect node event meta 2024-05-24 11:30:42 +02:00
Jonathan 5ef49024bf #13783 change macros when no sync meta and node 2024-05-23 12:53:53 +02:00
Jonathan 6f32b047f3 #13737 Events - url on comments and event custom id 2024-05-21 12:43:56 +02:00
daniel a5aecac20c Merge remote-tracking branch 'origin/develop' into ent-13668-release-777 2024-05-21 08:23:51 +02:00
Diego Muñoz-Reja f6ec4f8004 Merge branch 'ent-13728-vulnerabilidades-sql-injection-y-os-command-injection' into 'develop'
fix vulnerabilities events and api and fixed metaconsole responses pandora_enterprise#13728

See merge request artica/pandorafms!7393
2024-05-20 08:10:56 +00:00
Jose Martin 97750b7370 Merge branch 'ent-13246-cambios-de-estados-en-grouped-by-events-en-los-detalles-de-evento' into 'develop'
Ent 13246 Cambios de estados en grouped by events en los detalles de evento

See merge request artica/pandorafms!7335
2024-05-17 09:15:59 +00:00
Matias Didier 874aa23a49 Merge branch 'ent-13013-17205-no-se-muestran-el-numero-de-elementos-duplicados-en-los-detalles-de-evento' into 'develop'
Ent 13013 17205 no se muestran el numero de elementos duplicados en los detalles de evento

See merge request artica/pandorafms!7361
2024-05-17 07:10:31 +00:00
daniel 36c972c175 fix vulnerabilities events and api and fixed metaconsole responses pandora_enterprise#13728 2024-05-16 18:10:19 +02:00
daniel d9cd306ab8 fix errors in translations pandora_enterprise#13668 2024-05-15 14:08:44 +02:00
Jonathan a2fde8505f #13719 from_base64 no needed on custom_data 2024-05-13 14:42:24 +02:00
Daniel Maya 0c6216622c #13712 Fixed response in metaconsole 2024-05-10 14:54:10 +02:00
Daniel Cebrian 3ac4df3f34 #13246 fixed change status in grouped event 2024-05-10 13:11:48 +02:00
Jonathan ef2156dd5a #13013 add filters event dialog 2024-05-09 10:14:55 +02:00
Jonathan d923b5e463 #13013 add if count duplicated by extra id 2024-05-09 09:14:09 +02:00
Daniel Cebrian 4c485be711 Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta 2024-04-26 12:41:08 +02:00
Jose Martin e2fc9e27bf Merge branch 'ent-13287-botones-columnas-sobrantes-en-eventos-para-usuario-sin-permisos' into 'develop'
Ent 13287 botones columnas sobrantes en eventos para usuario sin permisos

See merge request artica/pandorafms!7261
2024-04-25 06:32:33 +00:00
Jose Martin fc8538108a Merge branch 'ent-13223-Se-pueden-abrir-muchas-instrucciones-de-evento-de-manera-simultánea' into 'develop'
Ent 13223 se pueden abrir muchas instrucciones de evento de manera simultánea

See merge request artica/pandorafms!7270
2024-04-24 11:43:25 +00:00
Jorge Rincon a41a1becfa #13223 Fixed instructions dialog in events as a modal 2024-04-24 09:56:48 +02:00
Pablo Aragon e0a16d3a15 13287-Remove Delete icon in Events for EW users 2024-04-24 08:10:19 +02:00
Daniel Cebrian d41e3d44a9 #13264 fixed injection " 2024-04-23 17:15:30 +02:00
Jorge Rincon cacd05d667 #13223 Fixed instructions dialog in events 2024-04-23 17:12:36 +02:00
Daniel Cebrian 6d33c36cb0 #13264 fixed sql injection 2024-04-23 17:01:47 +02:00
Daniel Cebrian 64013c0416 #13264 added regex in sql 2024-04-23 16:56:28 +02:00
Pablo Aragon 4a20bdb2fd 13562-Fix duplicate column id_grupo in events_get_all() 2024-04-16 12:10:05 +02:00
Daniel Cebrian 6e2e0c231a Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta 2024-04-15 13:35:55 +02:00
Daniel Cebrian 8d9a89a6a8 Merge branch 'develop' into ent-13035-cambiar-comportamiento-del-mecanismo-de-loginhash-meta 2024-04-15 09:54:30 +02:00
Pablo Aragon d967b7076a 13473-Fix acl widgets Block histogram, Module histogram and Tree view (histogram graph) 2024-04-12 08:53:11 +02:00
Daniel Cebrian 22c1b6e872 #13035 refactored password_hash 2024-04-11 10:26:53 +02:00
Daniel Cebrian 43f8d5888c #13322 fixed event comment filter 2024-04-05 09:49:17 +02:00
Daniel Cebrian 23f9866a1c #13322 fixed filter comment 2024-04-04 20:27:43 +02:00
Pablo Aragon 848e7dd5b0 Merge branch 'develop' into ent-13314-bordes-blancos-en-tema-negro-de-la-tactical-view-son-muy-feos 2024-04-04 16:58:14 +02:00
Félix Suárez e157d5f202 Handle to show instructions on unknown 2024-04-03 09:39:01 -06:00
Daniel Cebrian e682a44d8b #13079 fixed bug in sql 2024-03-20 18:07:53 +01:00
Daniel Cebrian db871e8a29 #13079 performance events fixed in comments 2024-03-20 17:15:30 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
2024-02-27 17:27:10 +01:00
alejandro.campos@artica.es 77dd8b1fb9 minor fixes 2024-02-22 15:07:18 +01:00
alejandro.campos@artica.es 195766e11c minor fixes 2024-02-22 15:05:48 +01:00
alejandro.campos@artica.es 7773967c71 move mr 2024-02-21 10:11:37 +01:00
alejandro.campos@artica.es 1991b74b9b Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query 2024-02-21 10:05:11 +01:00
alejandro.campos@artica.es df7435132a change regex search in events 2024-02-16 10:10:38 +01:00
alejandro.campos@artica.es c7de5a1eba search collapsing whitespaces 2024-02-13 18:28:20 +01:00
daniel 0f6fab06fb new api 2.0 2024-02-12 09:49:44 +01:00
daniel 3c3ff1a2e6 new api 2.0 2024-01-30 16:27:02 +01:00
daniel df1d2675ed Merge remote-tracking branch 'origin' into ent-12019-api-2-0 2024-01-30 08:13:47 +01:00
daniel 7adf296b0f new api 2.0 2024-01-29 16:37:49 +01:00
daniel b3dd6cbb4c new api 2.0 2024-01-29 16:09:08 +01:00
Alejandro Campos 618f677906 Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada'
# Conflicts:
#   pandora_console/include/functions_events.php
#   pandora_console/operation/events/events.php
2024-01-26 13:42:59 +00:00