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

30217 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 1a030bcd42 fixed several netflow bugs 2022-03-21 12:21:47 +01:00
fbsanchez 82c5cbb929 PJ scheduler only enterprise 2022-03-21 12:07:14 +01:00
fbsanchez 2796d3c4e2 Merge remote-tracking branch 'origin/develop' into ent-8399-borrado-contenido-cache 2022-03-21 11:30:32 +01:00
Daniel Barbero Martin 76d8918a4e fixed CV in console mobile metaconsole #8676 2022-03-21 10:04:11 +01:00
Daniel Barbero Martin 0342f2a908 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-21 09:06:44 +01:00
artica c736fbe726 Auto-updated build strings. 2022-03-21 01:00:36 +01:00
artica 95057697d8 Auto-updated build strings. 2022-03-20 01:00:36 +01:00
artica db28f5fbbe Auto-updated build strings. 2022-03-19 01:00:42 +01:00
Daniel Rodriguez 82474264a7 Merge branch 'ent-8339-POST-Macros-para-custom-data-de-eventos' into 'develop' 
Ent 8339 post macros para custom data de eventos

See merge request artica/pandorafms!4749
 2022-03-18 13:56:49 +00:00
Daniel Rodriguez 7d062a11d3 Merge branch 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM' into 'develop' 
added new field to ipam vlan

See merge request artica/pandorafms!4715
 2022-03-18 13:55:36 +00:00
José González a90e31be4f Fix credential storing with spaces 2022-03-18 14:03:36 +01:00
Daniel Barbero Martin e5f8e32a9e fixed CV in console mobile metaconsole #8676 2022-03-18 13:07:29 +01:00
Daniel Rodriguez a4947d5449 Merge branch 'ent-8622-alert-server-solo-el-master-dispara-alertas' into 'develop' 
RR alertserver

See merge request artica/pandorafms!4761
 2022-03-18 11:05:36 +00:00
Daniel Rodriguez 4c418f5979 Merge branch 'ent-8596-Mal-funcionamiento-en-el-cálculo-de-estado-por-elementos-críticos-en-Consolas-Visuales' into 'develop' 
Ent 8596 mal funcionamiento en el cálculo de estado por elementos críticos en consolas visuales

See merge request artica/pandorafms!4745
 2022-03-18 10:57:37 +00:00
alejandro.campos@artica.es e1ec4ce40e change storage format of custom data field in DB 2022-03-18 11:23:29 +01:00
Daniel Barbero Martin 8ef56aa076 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-18 09:05:38 +01:00
artica e088c0e564 Auto-updated build strings. 2022-03-18 01:00:41 +01:00
José González db3f943e09 Fix issue with fields in alerts 2022-03-17 17:45:08 +01:00
Daniel Maya c2d60fafa9 #8596 Fixed image-item 2022-03-17 16:37:43 +01:00
Daniel Maya e83d63430c #8533 added show module data 2022-03-17 14:48:01 +01:00
Daniel Rodriguez 8ff3b4f0ee Merge branch 'ent-8243-Netflow-nuevo-informe-top-n-connections' into 'develop' 
Ent 8243 netflow nuevo informe top n connections

See merge request artica/pandorafms!4709
 2022-03-17 08:56:07 +00:00
Daniel Rodriguez 59b51ea606 Merge branch 'ent-8624-command-snapshow-view-debe-mostrar-fuentes-monoespacio' into 'develop' 
Command snapshot monospaced font

See merge request artica/pandorafms!4762
 2022-03-17 08:55:29 +00:00
Daniel Barbero Martin 51998d5e71 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-17 08:57:17 +01:00
artica 1bc96bb92d Auto-updated build strings. 2022-03-17 01:00:40 +01:00
Daniel Barbero Martin 066568e1d4 fixed CV in console mobile metaconsole #8676 2022-03-16 17:50:46 +01:00
Alejandro Campos 0c41459b83 Merge branch 'develop' into 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM' 
# Conflicts:
#   pandora_console/extras/mr/53.sql
 2022-03-16 14:07:23 +00:00
Daniel Rodriguez 0ca61eff7a Merge branch 'ent-8699-error-sql-al-crear-usuario-sin-perfil' into 'develop' 
Fix sql error when user has no profile

See merge request artica/pandorafms!4757
 2022-03-16 10:06:04 +00:00
Daniel Barbero Martin eca1ba3917 Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-16 08:54:55 +01:00
artica f04a5be8e4 Auto-updated build strings. 2022-03-16 01:00:48 +01:00
Daniel Barbero Martin 6c4d2f2b31 fixed CV in console mobile metaconsole #8676 2022-03-15 18:12:01 +01:00
alejandro.campos@artica.es 7d38617278 Merge remote-tracking branch 'origin/develop' into ent-8243-Netflow-nuevo-informe-top-n-connections 2022-03-15 17:09:19 +01:00
alejandro.campos@artica.es 27ff467a74 fixed application of policies to individual groups 2022-03-15 13:44:40 +01:00
Daniel Barbero Martin a310194f5d Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-15 11:47:55 +01:00
Daniel Rodriguez de75277c8a Merge branch 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' into 'develop' 
Fix missing include

See merge request artica/pandorafms!4741
 2022-03-15 10:47:39 +00:00
Daniel Barbero Martin 9e07afdab2 fixed CV in console mobile metaconsole #8676 2022-03-15 11:39:57 +01:00
Daniel Rodriguez 4dc6f7764c Merge branch 'ent-8400-borrado-backups-generados-por-tareas-de-consolas' into 'develop' 
Missed tables

See merge request artica/pandorafms!4721
 2022-03-15 10:09:32 +00:00
Daniel Rodriguez b582fff47e Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop' 
Fix upload of not wanted files in File Manager

See merge request artica/pandorafms!4754
 2022-03-15 10:08:48 +00:00
Daniel Rodriguez 7af03dfeef Merge branch 'ent-8566-multiples-bugs-version-movil' into 'develop' 
Ent 8566 multiples bugs version movil

See merge request artica/pandorafms!4716
 2022-03-15 10:08:01 +00:00
Daniel Rodriguez f513a04e75 Merge branch 'ent-8547-POST-Macro-para-nombre-completo-de-usuario-event-responses' into 'develop' 
Ent 8547 post macro para nombre completo de usuario event responses

See merge request artica/pandorafms!4747
 2022-03-15 10:07:28 +00:00
Daniel Rodriguez d7598cefa5 Merge branch 'ent-8662-modulos-modulo-padre-no-se-ven-en-tree-view' into 'develop' 
Clean filtered references for parent modules

See merge request artica/pandorafms!4744
 2022-03-15 10:06:18 +00:00
Daniel Rodriguez c9a31722d4 Merge branch 'ent-8102-giss-interfaz-de-base-de-datos-para-metaconsola' into 'develop' 
Added db interface to metaconsole with option to query nodes

See merge request artica/pandorafms!4679
 2022-03-15 10:05:37 +00:00
Calvo 6067f356e9 Command snapshot monospaced font 2022-03-15 09:21:34 +01:00
Luis ae7c81bd8e Update pandora_console/include/functions_ui.php 2022-03-15 07:38:47 +00:00
Daniel Barbero Martin a3d248912a Merge remote-tracking branch 'origin/develop' into ent-8676-consolas-visuales-en-consola-movil 2022-03-15 07:47:55 +01:00
artica 1ee2387d6c Auto-updated build strings. 2022-03-15 01:00:17 +01:00
fbsanchez 97a48ab714 RR alertserver 2022-03-14 19:24:29 +01:00
Calvo 52df92e715 Fix files repo download file hash error 2022-03-14 17:56:04 +01:00
Calvo 6dc775649d Fix dashboard events responses 2022-03-14 15:29:40 +01:00
fbsanchez 58a473276f js module fixes 2022-03-14 12:10:30 +01:00
José González 0dd6dc48b7 Solve generated issues 2022-03-14 11:51:49 +01:00