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

399 Commits

Author SHA1 Message Date
Daniel Barbero Martin e009257d2f bugs events pandora_enterprise#9239 2022-06-30 11:56:25 +02:00
Diego Muñoz-Reja 9120eb44c5 Merge branch 'ent-9231-grave-problema-seguridad-vista-de-eventos-metaconsola' into 'develop' 
fix events pandora_enterprise#9231

See merge request artica/pandorafms!4990
 2022-06-28 15:37:46 +00:00
Daniel Barbero Martin 0957dd338f fix events pandora_enterprise#9231 2022-06-28 16:56:25 +02:00
José González b03356cc3c Merge branch 'develop' into 'ent-9089-Mejoras-usabilidad-menu-gestion-eventos' 
# Conflicts:
#   pandora_console/godmode/menu.php
 2022-06-28 14:08:13 +00: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 58f5f4e9f1 refactor events meta pandora_enterprise#9086 2022-06-23 12:47:49 +02:00
Daniel Barbero Martin 0c09e7fc22 refactor events meta pandora_enterprise#9086 2022-06-22 14:05:21 +02:00
Daniel Barbero Martin 4b00e8ee3c refactor events meta pandora_enterprise#9086 2022-06-22 10:29:19 +02:00
Daniel Barbero Martin 9d23b9af4a refactor events meta pandora_enterprise#9086 2022-06-21 11:17:18 +02:00
Daniel Barbero Martin 3e59093b0e refactor events meta pandora_enterprise#9086 2022-06-20 12:29:00 +02:00
Daniel Barbero Martin 7e25a86d52 refactor events meta pandora_enterprise#9086 2022-06-17 12:50:40 +02:00
Daniel Barbero Martin 8ad6d350af refactor events meta pandora_enterprise#9086 2022-06-15 13:06:10 +02:00
Daniel Barbero Martin 3b3e964cf9 Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado 2022-06-14 07:57:18 +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 90013603a7 refactor events meta pandora_enterprise#9086 2022-06-13 17:06:09 +02:00
Daniel Rodriguez 38de162f94 Merge branch 'ent-9031-Mejora-visual-Cajas-de-busqueda-avanzada-de-ver-eventos' into 'develop' 
Ent 9031 mejora visual cajas de busqueda avanzada de ver eventos

See merge request artica/pandorafms!4925
 2022-06-13 09:22:54 +00:00
Daniel Rodriguez 3506fd0067 Merge branch 'ent-9030-cambiar-altura-lista-vista-filtro-eventos' into 'develop' 
Change selector size

See merge request artica/pandorafms!4920
 2022-06-13 09:22:22 +00:00
Daniel Barbero Martin 8dbc860f4a refactor events meta pandora_enterprise#9086 2022-06-08 17:01:15 +02:00
Daniel Barbero Martin ee2810e680 refactor events meta pandora_enterprise#9086 2022-06-07 17:25:51 +02:00
José González 1be4948e2d Changed strings and improve code 2022-06-03 12:26: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 Maya f4784f4922 #9031 Fixed css filter 2022-05-31 17:09:15 +02:00
Daniel Barbero Martin f6de9fb0a0 events sound pandora_enterprise#7960 2022-05-31 10:10:44 +02:00
José González 24ff171f7f Change selector size 2022-05-27 12:17:26 +02:00
José González 77636d68ff Fix fb64 forgiven severity params 2022-04-11 15:22:37 +02:00
alejandro.campos@artica.es d137e0d798 implemented custom data filter in event view 2022-03-29 18:09:19 +02:00
alejandro.campos@artica.es 5757d4a933 implement csv export of events in meta and minor fixes 2022-03-23 14:24:39 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Rodriguez 10e282b76b Merge branch 'ent-8108-Error-en-la-vista-de-eventos-de-un-agente-concreto' into 'develop' 
fixed filter loaded from event graph on agent view

See merge request artica/pandorafms!4564
 2021-12-28 12:02:56 +00:00
Jose Gonzalez 37675e0fce Added php8 function and solve issue with agent id sorting in events 2021-12-16 16:35:31 +01:00
fbsanchez cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
alejandro.campos@artica.es da22381044 fixed filter loaded from event graph on agent view 2021-12-01 11:13:28 +01:00
Calvo d7f590bacb Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-11-24 13:42:48 +01:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-23 14:29:23 +01:00
Daniel Maya c3295b8fd2 #8191 Fixed filter 2021-11-19 11:38:11 +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
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 3204fdb71f Merge remote-tracking branch 'origin/develop' into ent-7844-revision-acl-enterprise-parte-3-fallos-actuales 2021-09-01 11:06:20 +02:00
Daniel Rodriguez 22587a0dde Merge branch 'ent-7036-11346-Introducir-el-campo-de-IP-del-agente-en-la-vista-de-eventos' into 'develop' 
Ent 7036 11346 introducir el campo de ip del agente en la vista de eventos

See merge request artica/pandorafms!4275
 2021-08-25 13:00:42 +00:00
Daniel Rodriguez fe30b9c785 Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop' 
implemented capacity to handle string data for event data

See merge request artica/pandorafms!4184
 2021-08-17 12:19:54 +00:00
Calvo 34c3b00426 WIP: Revision ACL part 3 2021-08-13 15:57:01 +02:00
Daniel Rodriguez 77d00fd9e2 Merge branch 'ent-7647-vulnerabilidad-xss-en.nombre.filtro-eventos' into 'develop' 
Fixedd XSS on load filter event name

See merge request artica/pandorafms!4174
 2021-08-09 09:00:15 +00:00
Alejandro Campos ff93169049 Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' 
# Conflicts:
#   pandora_console/extras/mr/48.sql
 2021-08-09 06:45:46 +00:00
fbsanchez 3d5ae6887c Event migration warnings popups 2021-07-07 16:11:20 +02:00
Daniel Maya 66e9539818 Added agent ip in custom events 2021-07-07 16:07:08 +02:00
José González 47b6e40799 Added controls for filter with hours 2021-07-05 17:42:45 +02:00
alejandro.campos@artica.es 240efc4dcf truncate string 2021-06-08 16:48:01 +02:00
alejandro.campos@artica.es fdc6d2f4c8 implemented capacity to handle string data for event data 2021-06-08 16:09:37 +02:00
Calvo 2f3cae8d61 Fixedd XSS on load filter event name 2021-06-04 13:36:32 +02:00