fbsanchez
|
380c77be02
|
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
Conflicts:
pandora_console/include/lib/Module.php
pandora_console/include/visual-console-client/vc.main.css.map
|
2021-02-02 12:15:24 +01:00 |
Luis Calvo
|
778419e71d
|
Merge remote-tracking branch 'origin/develop' into ent-6844-quitar-vista-estadisticas-eventos
|
2021-01-25 13:06:36 +01:00 |
Daniel Rodriguez
|
f92ba2ce3d
|
Merge branch 'ent-6503-vista-tactica-numero-alertas' into 'develop'
Modified query for show only available alerts
Closes pandora_enterprise#6503
See merge request artica/pandorafms!3672
|
2021-01-25 10:11:25 +01:00 |
alejandro-campos
|
731d486455
|
changed behavior of All group and fixed acl vulnerability
|
2021-01-20 18:22:43 +01:00 |
|
alejandro-campos
|
535486a429
|
Merge branch 'develop' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3
|
2021-01-18 11:48:51 +01:00 |
Jose Gonzalez
|
579b8d4965
|
Solve issue and added correct headers
|
2021-01-14 19:08:01 +01:00 |
|
Daniel Rodriguez
|
18cba9ad84
|
Merge branch 'ent-5489-Filtrar-desde-SEARCH-GENERAL-grupos-secundarios' into 'develop'
Ent 5489 filtrar desde search general grupos secundarios
See merge request artica/pandorafms!3614
|
2021-01-14 14:46:03 +01:00 |
Daniel Maya
|
dfeb42983f
|
Ent 6605 buscador general no encuentra mapas
|
2021-01-14 14:36:47 +01:00 |
|
alejandro-campos
|
366d02f203
|
Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3
|
2021-01-14 09:22:06 +01:00 |
|
Daniel Rodriguez
|
8d7ac33cf1
|
Merge branch 'ent-6653-Error-enlace-publico-en-Consolas-Visuales-linkadas' into 'develop'
fix public view link remove hash
See merge request artica/pandorafms!3639
|
2021-01-11 13:23:05 +01:00 |
|
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 |
|
Luis Calvo
|
210f2057cd
|
Removes event_statistics view
|
2020-12-21 17:56:24 +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 |
|
Daniel Barbero Martin
|
266dc8ba4a
|
fix public view link remove hash
|
2020-11-23 16:38:06 +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 |
|
Daniel Maya
|
4023327091
|
Added search by secondary group name
|
2020-11-16 12:30:58 +01:00 |
|
fbsanchez
|
b8437bec79
|
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
|
2020-11-11 11:09:30 +01:00 |
|
Luis
|
2f2556ef79
|
Ent 6680 ventana de perdida de conexion incorrecta
|
2020-11-04 16:41:25 +01:00 |
|
fbsanchez
|
b585a4e372
|
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
|
2020-11-03 16:35: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 |
|
fbsanchez
|
326d1dac49
|
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
|
2020-10-30 10:38:30 +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
|
27ba6a3adf
|
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
|
2020-10-29 12:57:20 +01:00 |