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

3913 Commits

Author SHA1 Message Date
vgilc abdd33949d Merge branch '2877_Mejora_audit_log' into 'develop' 
Fixed Audit log in profiles, collections and policies

See merge request artica/pandorafms!1876
 2018-12-04 08:15:42 +01:00
samucarc 34986a5477 Merge branch 'develop' into 2877_Mejora_audit_log 
# Conflicts:
#	pandora_console/godmode/users/profile_list.php
 2018-12-03 18:57:04 +01:00
vgilc d9e3b58aee Merge branch '2893-Error-configuración-personalizada-de-eventos' into 'develop' 
Changed timestamp value by default - #2893

See merge request artica/pandorafms!1881
 2018-12-03 15:36:10 +01:00
vgilc 7d52afff16 Merge branch '1886-Bug-Aviso-Enterprise-Network-Component-Open' into 'develop' 
Changed the value from modal to false - #1886

See merge request artica/pandorafms!1828
 2018-11-30 13:37:44 +01:00
vgilc 33603a79d8 Merge branch '2176-SNMP-Wizard-Nombres-de-modulos-con-entities2' into 'develop' 
Fixed bug in SNMP Wizard

See merge request artica/pandorafms!1929
 2018-11-30 13:37:07 +01:00
vgilc b45ad25b56 Merge branch '2658_Operaciones_masicas_sobre_politicas' into 'develop' 
Fixed centralized management in nodes

See merge request artica/pandorafms!1870
 2018-11-30 13:28:58 +01:00
vgilc 111ae09928 Merge branch '2722-Labels-en-visual-console' into 'develop' 
fixed labels not showing for percentile item in visual console builder

See merge request artica/pandorafms!2019
 2018-11-30 13:27:15 +01:00
vgilc bf66319d90 Merge branch '2907-TIP-para-Query-History-DataBase' into 'develop' 
Tip added - #2907

See merge request artica/pandorafms!1884
 2018-11-30 13:09:15 +01:00
vgilc 4bdc7d5303 Merge branch '3077-Fallos_en_las_consolas_visuales' into 'develop' 
fixed errors in visual console

See merge request artica/pandorafms!2026
 2018-11-30 13:04:31 +01:00
vgilc ce8e33ba29 Merge branch '2517-api-listar-y-crear-perfiles-de-usuario-en-meta-6168-eucomm' into 'develop' 
2517 api listar y crear perfiles de usuario en meta 6168 eucomm

See merge request artica/pandorafms!1905
 2018-11-30 12:22:37 +01:00
vgilc b8b43b33d7 Merge branch 'ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm' into 'develop' 
Ent 2520 api listar y crear repuestas de eventos 6165 eucomm

See merge request artica/pandorafms!1896
 2018-11-30 10:50:59 +01:00
daniel 9bdd1af488 fixed errors in visual console 2018-11-29 13:24:12 +01:00
alejandro-campos d48c228855 fixed label not showing on page reload in visual console's percentile item 2018-11-27 15:25:16 +01:00
daniel 1b78c1a78d fixed error log js and warning php visual style 2018-11-23 09:21:22 +01:00
daniel a3aa84bf92 fixed errors in session with send mail alerts graph API 2018-11-21 15:16:52 +01:00
daniel 494b858a20 fixed errors session_start 2018-11-21 13:08:58 +01:00
vgilc 5ac947c2fd Merge branch 'ent-2169-REDIRIS-modificacion-de-comandos-en-alertas' into 'develop' 
Ent 2169 rediris modificacion de comandos en alertas

See merge request artica/pandorafms!1878
 2018-11-20 11:33:00 +01:00
fermin831 8735e6e1a3 Added a translation 2018-11-20 11:18:57 +01:00
daniel 449c02763a fixed minor error cfv 2018-11-16 13:22:10 +01:00
vgilc a00c10a136 Merge branch '2166-Hide-not-init-agents-2' into 'develop' 
removed hide not init modules from sla and availability report

See merge request artica/pandorafms!1976
 2018-11-15 17:20:00 +01:00
alejandro-campos a1846a6e22 removed hide not init modules from sla and availability report 2018-11-15 12:00:25 +01:00
daniel 6174e622c8 create alert php7 2018-11-14 18:15:48 +01:00
daniel 60212dae50 fixed errors cv 2018-11-14 16:38:44 +01:00
daniel 22a26aa072 fixed error upgrade jquery 2018-11-14 11:40:01 +01:00
vgilc d91f81d0ed Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
fixed minor bug: Assigned node field showing in meta user update form when…

See merge request artica/pandorafms!1968
 2018-11-14 08:30:42 +01:00
alejandro-campos 5eed82eb62 fixed minor bug: Assigned node field showing in meta user update form when selecting admin profile in case the user was a stardard user 2018-11-13 19:00:16 +01:00
daniel ac671d041c Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-13 15:47:07 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
alejandro-campos c5a0065cba decoded entities when retrieving module name in case SNMP module name is updated 2018-11-13 11:50:46 +01:00
vgilc 6d0d7fd410 Merge branch '2718-Creacion-de-usuarios-desde-metaconsola' into 'develop' 
removed Assigned node field from admin global profile when creating user from metaconsole

See merge request artica/pandorafms!1959
 2018-11-12 16:49:08 +01:00
alejandro-campos 75ad60a071 removed Assigned node field from admin global profile when creating user from metaconsole 2018-11-12 15:57:18 +01:00
daniel afaa6ad2ba Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-12 09:07:56 +01:00
fermin831 d63666cbbc Merge branch 'develop' into ent-2169-REDIRIS-modificacion-de-comandos-en-alertas 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/godmode/alerts/alert_actions.php

Modified files extra:
	pandora_console/include/functions_alerts.php
 2018-11-08 14:00:49 +01:00
daniel 5c99a8138f fixed minor error 2018-11-07 17:16:25 +01:00
manuel.montes c131c631d4 Fixed bug in visual styles configuration 2018-11-07 16:34:09 +01:00
daniel 3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01:00
manuel.montes 45b757b5db Fixed bug in SNMP Wizard 2018-11-05 14:17:43 +01:00
daniel c4eeb3cc76 fixed error edit modules in massive operation php7 error select 2018-11-02 10:18:33 +01:00
daniel f2b1c99013 fixed minor error cluster name by alias 2018-11-02 09:56:31 +01:00
daniel 78a1c72eac fixed warnings php7 2018-10-30 17:38:46 +01:00
vgilc e6a9ca7bfb Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 
fixed errors php7

See merge request artica/pandorafms!1916
 2018-10-30 15:00:54 +01:00
daniel 0978be9b51 fixed errors php7 2018-10-30 14:43:27 +01:00
fermin831 294553941d Fixed add button on alerts 2018-10-29 16:41:55 +01:00
fermin831 c7a624000e Added API function set delete_user_profile_info 2018-10-29 13:34:30 +01:00
vgilc e03f56f0d7 Merge branch '2429-Resaltar-elementos-al-pasar-por-encima-o-marcar' into 'develop' 
2429 resaltar elementos al pasar por encima o marcar

See merge request artica/pandorafms!1762
 2018-10-29 09:17:54 +01:00
vgilc 08a8165b93 Merge branch '2827-Mensaje-de-alerta-disparada' into 'develop' 
Added number of times an alert is fired - #2827

See merge request artica/pandorafms!1823
 2018-10-29 09:15:32 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
fermin831 d70969e6e9 Merge branch 'develop' into ent-2520-api-listar-y-crear-repuestas-de-eventos-6165-eucomm 
Conflicts resolved:
	pandora_console/include/functions_api.php
 2018-10-25 15:45:16 +02:00
fermin831 f831e59ac3 Added documentation and minor fixes related with API event responses functions 2018-10-25 15:42:45 +02:00
fermin831 1bd492307a Added set update_event_response to API 2018-10-25 15:25:27 +02:00