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

23994 Commits

Author SHA1 Message Date
marcos e265bc2970 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-19 09:31:31 +01:00
artica a04b92a0bc Auto-updated build strings. 2020-02-19 09:12:12 +01:00
Alejandro Fraguas 1acfaa9cdc Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop' 
Ent 5429 cambios en el editor de modulos

See merge request artica/pandorafms!3052
 2020-02-18 14:03:36 +01:00
alejandro-campos 65b3b1dc36 fix bug in form action 2020-02-18 13:47:47 +01:00
Daniel Rodriguez e9bd718eaa Merge branch 'ent-5457-suid-nodos-elastic' into 'develop' 
Ent 5457 suid nodos elastic

See merge request artica/pandorafms!3062
 2020-02-18 13:24:22 +01:00
Daniel Maya 87dc92ffd9 Ent 5457 suid nodos elastic 2020-02-18 13:24:22 +01:00
marcos 2dffb967cc Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-18 12:58:11 +01:00
Daniel Rodriguez 46f282a5e1 Merge branch 'ent-5360-revisar-el-comportamiento-de-xml_buffer-y-secondary_mode' into 'develop' 
Unify file transfer, secondary mode and XML buffer criteria.

See merge request artica/pandorafms!3034
 2020-02-18 12:49:06 +01:00
Ramon Novoa 77cc2c6040 Fix a typo. 2020-02-18 12:03:34 +01:00
alejandro-campos b9e3c70374 fix bug when saving netflow filters 2020-02-18 11:25:45 +01:00
Daniel Barbero Martin 1ab92fe798 Fixed error event history VC 2020-02-18 08:08:56 +01:00
Daniel Barbero Martin dd437be186 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-18 07:55:19 +01:00
artica 92e1492f2b Auto-updated build strings. 2020-02-18 00:01:12 +01:00
marcos 7564249207 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-17 16:15:29 +01:00
marcos fbea1e7077 remove entities reports 2020-02-17 15:54:09 +01:00
marcos dea661f14d update 2020-02-17 14:49:34 +01:00
marcos 6a8fa93358 updates 2020-02-17 13:53:38 +01:00
Daniel Rodriguez a3d4fdf9c6 Merge branch 'ent-4154-Configuración-purgado-histórico-duplicada-+-error' into 'develop' 
Added button for close error popup - #4154

See merge request artica/pandorafms!2674
 2020-02-17 13:26:32 +01:00
marcos b521cc37fd update reports entitines 2020-02-17 13:17:33 +01:00
marcos 21a14c4d42 alert correlation update 2020-02-17 12:55:03 +01:00
Daniel Barbero Martin 3ad9e3c420 Fixed error event history VC 2020-02-17 08:19:36 +01:00
Daniel Barbero Martin f3b744717e Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-17 08:06:50 +01:00
Junichi Satoh 767cb01185 Fixed problem of evaluation for last_execution by casting time() to integer. 2020-02-17 11:13:44 +09:00
artica bf0211c9b8 Auto-updated build strings. 2020-02-17 00:01:09 +01:00
artica 6a3d1b4992 Auto-updated build strings. 2020-02-16 00:01:08 +01:00
artica 19b59f2819 Auto-updated build strings. 2020-02-15 00:01:16 +01:00
Kevin 15a4bd0763 Replaced old policies with reworked ones 2020-02-14 11:18:21 +01:00
artica e60ccb8a68 Auto-updated build strings. 2020-02-14 00:01:12 +01:00
ismael.moreno 21ae9a1925 Fixed description 2020-02-13 12:35:28 +01:00
Daniel Barbero Martin f9c944fa8d Fixed error events history VC 2020-02-13 10:08:50 +01:00
Daniel Barbero Martin c96dd8e930 Fix selector modules only string in VC barsgraph and donutgraph 2020-02-13 09:55:49 +01:00
Daniel Maya 1e4217d1c6 Changed Inserts in tpolicy 2020-02-13 09:22:57 +01:00
Daniel Barbero Martin 10972a2364 Fix bug icon builder view not legacy mode 2020-02-13 08:45:25 +01:00
Daniel Barbero Martin cad6889c46 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-13 07:58:06 +01:00
artica d1663cd242 Auto-updated build strings. 2020-02-13 00:01:09 +01:00
Daniel Rodriguez 29f34ae416 Merge branch 'ent-5318-no-hay-opcion-de-pantalla-completa-para-las-consolas-visuales-en-la-meta' into 'develop' 
Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta

See merge request artica/pandorafms!3053
 2020-02-12 17:05:29 +01:00
Daniel Maya e908019d4f Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta 2020-02-12 17:05:29 +01:00
artica 79fe01ee56 Auto-updated build strings. 2020-02-12 00:01:09 +01:00
Daniel Rodriguez 5d436d214b Merge branch 'ent-4740-revision-completa-de-informes-templates-en-nodo' into 'develop' 
Fixed bug in prediction report item 4740

See merge request artica/pandorafms!2872
 2020-02-11 15:39:26 +01:00
Daniel Rodriguez 2b9b53f84a Merge branch '4916-macros-no-funciona-versiones-nuevas' into 'develop' 
Changed mode of decode_json

See merge request artica/pandorafms!2924
 2020-02-11 13:20:16 +01:00
alejandro-campos 526ba37151 minor visual change in threshold graph 2020-02-11 10:10:03 +01:00
Daniel Barbero Martin 962b3d2248 Fix linked ACL another VC 2020-02-11 09:45:43 +01:00
Alejandro Fraguas f1a52d6272 Merge branch 'ent-4771-Revision-llamada-API-create-event-en-metaconsola' into 'develop' 
Ent 4771 revision llamada api create event en metaconsola

See merge request artica/pandorafms!2793
 2020-02-11 09:37:40 +01:00
Daniel Barbero Martin 1d2ad47507 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-11 07:57:42 +01:00
artica 0db7abbe9e Auto-updated build strings. 2020-02-11 00:01:12 +01:00
Daniel Barbero Martin 0042f390ef Fixed errors VC 2020-02-10 17:31:48 +01:00
Tatiana Llorente f2ff861b4d Merge remote-tracking branch 'origin/develop' into ent-4154-Configuración-purgado-histórico-duplicada-+-error 
Conflicts:
	pandora_console/general/mysqlerr.php
 2020-02-10 17:25:11 +01:00
Tatiana Llorente 740dcdb35b Changed id_agent for id_tagent 2020-02-10 17:10:39 +01:00
Tatiana Llorente 9a84c8c893 Changed id_agent for id_tagent 2020-02-10 17:05:03 +01:00
Tatiana Llorente 19f07b9b9e Changed id_agent for id_tagent 2020-02-10 17:01:36 +01:00