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

3966 Commits

Author SHA1 Message Date
Daniel Rodriguez 2e07d6215f Merge branch 'ent-6822-Error-SQL-en-SNMP-console' into 'develop' 
Ent 6822 error sql en snmp console

See merge request artica/pandorafms!3708
 2021-01-04 11:16:35 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop' 
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
 2020-12-23 17:19:46 +01:00
Daniel Rodriguez 41730cbe58 Merge branch 'ent-6339-Monitors-View-Metaconsole' into 'develop' 
Ent 6339 monitors view metaconsole

See merge request artica/pandorafms!3676
 2020-12-23 11:46:00 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
Daniel Rodriguez 697b467a77 Merge branch 'ent-5115-Metaconsola-Vista-de-monitores' into 'develop' 
Ent 5115 metaconsola vista de monitores

See merge request artica/pandorafms!3659
 2020-12-17 16:51:57 +01:00
Daniel Rodriguez b75d1149e0 Merge branch 'ent-4025-Cambio-de-contrase-en-user-edit-no-pide-contraseña-actual' into 'develop' 
active user password check

See merge request artica/pandorafms!3689
 2020-12-17 16:48:26 +01:00
Daniel Rodriguez 398cc3ac2a Merge branch 'ent-6689-Selector-de-grupos-muy-estrecho-en-Monitors-View-metaconsola' into 'develop' 
fix name filters

See merge request artica/pandorafms!3664
 2020-12-17 16:37:31 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Daniel Maya d642cbea43 Fixed empty agents 2020-12-10 14:07:36 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Daniel Rodriguez 98c5ef7142 Merge branch 'ent-6619-Remote-code-execution' into 'develop' 
fixed security vulnerability

See merge request artica/pandorafms!3591
 2020-12-02 17:16:05 +01:00
alejandro-campos 8aa18a1236 active user password check 2020-12-02 16:29:45 +01:00
Marcos Alconada f72d924f1e ticket 6435 2020-12-02 10:10:34 +01:00
Daniel Maya 2b52b3beef Show data type 2020-12-01 12:29:53 +01:00
Daniel Rodriguez 3801fffa6e Merge branch 'ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario' into 'develop' 
F2 feature

See merge request artica/pandorafms!3493
 2020-11-30 14:28:03 +01:00
daniel 35bfd765f3 fix SNMP v3 show realtime charts 2020-11-30 14:26:49 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Barbero Martin b3437b3432 fix name filters 2020-11-27 08:24:01 +01:00
Daniel Maya e9f8077c23 Fixed section in metaconsole 2020-11-26 12:28:12 +01:00
marcos 51322b48d7 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 09:31:14 +01:00
daniel ac547bf57e fix tree policies description 2020-11-23 16:57:56 +01:00
marcos 13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00
Daniel Rodriguez 38c9dafa1b Merge branch 'ent-6061-vmware-view' into 'develop' 
Discovery task instead Recon task in some places

See merge request artica/pandorafms!3507
 2020-11-17 16:38:29 +01:00
Luis 2f2556ef79 Ent 6680 ventana de perdida de conexion incorrecta 2020-11-04 16:41:25 +01:00
alejandro-campos 241c90f201 fixed security vulnerability 2020-11-03 15:58:53 +01:00
Daniel Rodriguez 946c548244 Merge branch 'ent-6626filtros-de-eventos-personalizados-no-guardia-varios-apartados' into 'develop' 
Primeras modificaciones del filtro de eventos

See merge request artica/pandorafms!3585
 2020-10-30 14:42:41 +01:00
daniel b3043c2e01 Fixed template events 2020-10-30 13:29:50 +01:00
Daniel Rodriguez 79db1c3236 Merge branch 'ent-6599-errores-en-filtro-de-monitor-detail' into 'develop' 
removed strict-user from monitor detail

See merge request artica/pandorafms!3568
 2020-10-30 13:28:35 +01:00
Daniel Rodriguez 64df831302 Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop' 
fix charts

See merge request artica/pandorafms!3581
 2020-10-30 13:23:03 +01:00
Daniel Rodriguez 9a5291da5a Merge branch 'ent-6578-Bugs-eventos-sonoros-3' into 'develop' 
fixed sound events

See merge request artica/pandorafms!3566
 2020-10-30 12:16:54 +01:00
Daniel Rodriguez 12b36e7f5a Merge branch 'ent-6554-status-vacio-al-exportar-eventos-a-csv' into 'develop' 
fixed error with value status field

See merge request artica/pandorafms!3548
 2020-10-29 15:15:52 +01:00
marcos 765d37d4e9 formato funcion 2020-10-29 15:06:01 +01:00
Daniel Rodriguez 4f3e09c6c3 Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop' 
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0

See merge request artica/pandorafms!3541
 2020-10-29 13:43:10 +01:00
fbsanchez 98a04bfcf8 omg... what a file 2020-10-29 12:55:44 +01:00
Daniel Maya 43ca5e4972 Ent 6482 fallo en la agrupación de eventos 2020-10-29 12:53:09 +01:00
fbsanchez 2748f0ac29 Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:41:24 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop' 
groups_get_children and propagate update

See merge request artica/pandorafms!3545
 2020-10-29 12:36:49 +01:00
marcos cf108c0a17 se cambia el valor del modulo y marca en el filtro usado 2020-10-29 12:30:54 +01:00
fbsanchez 24ba5f2615 Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:13:21 +01:00
marcos edc9038783 Primeras modificaciones del filtro de eventos 2020-10-29 10:24:37 +01:00
Daniel Barbero Martin 9b81da193b fix charts 2020-10-28 12:50:15 +01:00
alejandro-campos 7c882d3723 fixed connection check 2020-10-27 12:53:54 +01:00
alejandro-campos 6ff11239e4 fixed connection check in public link of visual consoles 2020-10-26 14:44:05 +01:00
fbsanchez 29174a87ef removed strict-user from monitor detail 2020-10-26 10:14:14 +01:00
alejandro-campos 4ff0923589 fixed sound events 2020-10-23 13:53:38 +02:00
marcos 8b6b573bde fixed error with value status field 2020-10-21 16:18:07 +02:00
fbsanchez 6b25ae6004 improved agent_module report (CSV) 2020-10-21 13:23:17 +02:00
fbsanchez 42cca865ac groups_get_children and propagate update 2020-10-21 11:38:57 +02:00
Daniel Maya 3c95d17482 Fixed new_agent 2020-10-20 16:15:42 +02:00
fbsanchez 5ce1bd23e4 Discovery task instead Recon task in some places 2020-10-07 10:56:40 +02:00