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

26141 Commits

Author SHA1 Message Date
Daniel Rodriguez 5658b52e3f Merge branch 'ent-6498-Alertas-siempre-marcan-modulos-como-critical-en-los-correos-con-el-mail-to-admin-por-defecto' into 'develop' 
changed mail to admin default action

See merge request artica/pandorafms!3656
 2021-01-04 11:10:19 +01:00
Daniel Maya f2b673b62b merge conflict resolved 2021-01-04 09:16:14 +01:00
artica a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica 740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica 35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
slerena a5f0784c24 Merge branch 'ent-fix-massive-user-management' into 'develop' 
Fixed problem that users with UM in specific groups can assign/delete profiles in other groups.

See merge request artica/pandorafms!3745
 2020-12-29 15:07:43 +01:00
artica 1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
Luis Calvo 47088a87b7 Fixed module id on snapshot view 2020-12-28 11:59:02 +01:00
artica 66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica 7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00
artica 223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00
Junichi Satoh 1c8b70d1eb Fixed problem that users with UM in specific groups can assign/delete profiles in other groups. 2020-12-25 17:38:03 +09:00
artica 57c1433764 Auto-updated build strings. 2020-12-25 01:00:15 +01:00
Daniel Rodriguez aee7ec4cb2 Merge branch 'ent-6897-estilos-rotos-metaconsola' into 'develop' 
Fixed broken styles in meta

See merge request artica/pandorafms!3743
 2020-12-24 10:30:01 +01:00
Luis Calvo 97a1020ec2 Removed item permissions report from report templates 2020-12-24 09:06:38 +01:00
artica 91b3aca7cf Auto-updated build strings. 2020-12-24 01:00:19 +01:00
Luis Calvo d8900704ed Fixed broken styles in meta 2020-12-23 17:58:05 +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 60f43dadb9 Merge branch 'ent-6719-mensaje-error-server-open' into 'develop' 
Fix error

Closes pandora_enterprise#6719

See merge request artica/pandorafms!3623
 2020-12-23 17:05:38 +01:00
Daniel Rodriguez fc49958c96 Merge branch 'ent-6681-SNMP-Browser-multiple-remote-components-y-abrir-ventana-adicional-en-el-navegador' into 'develop' 
Ent 6681 snmp browser multiple remote components y abrir ventana adicional en el navegador

See merge request artica/pandorafms!3608
 2020-12-23 16:55:56 +01:00
Daniel Rodriguez 1324725263 Merge branch 'ent-6856-Warning-feo-server' into 'develop' 
Applied fix

Closes pandora_enterprise#6856

See merge request artica/pandorafms!3725
 2020-12-23 16:06:24 +01:00
Daniel Rodriguez ccf806755b Merge branch 'ent-6854-Warning-feo-arrancar-servidor' into 'develop' 
Added fix

Closes pandora_enterprise#6854

See merge request artica/pandorafms!3726
 2020-12-23 16:04:53 +01:00
Luis Calvo f6a1260eef Fixed event filter creation with empty name 2020-12-23 15:33:52 +01:00
Luis Calvo 69c33b45fa Removed ip from connected user list 2020-12-23 14:33:20 +01:00
Daniel Rodriguez bc74565662 Merge branch 'ent-4491-Mostrar-siempre-arriba-el-valor-de-la-barra-de-grafico-en-consola-visual' into 'develop' 
fix custom graph

See merge request artica/pandorafms!3655
 2020-12-23 11:48:03 +01:00
Daniel Rodriguez 4f2d6bf136 Merge branch 'ent-6799-Edicion-Dashboards-fallo-al-cambiar-ancho-widgets' into 'develop' 
Fix gridstack js version 1.2

See merge request artica/pandorafms!3687
 2020-12-23 11:47:07 +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 908e5cf7ef Merge branch 'develop' into 'ent-6643-show-summary-vmware' 
# Conflicts:
#   pandora_console/godmode/wizards/DiscoveryTaskList.class.php
 2020-12-23 06:49:42 +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
artica 71371a10a9 Auto-updated build strings. 2020-12-23 01:00:15 +01:00
Daniel Rodriguez 30915ea8f8 Merge branch 'ent-6501-home-screen-link-externo' into 'develop' 
Added external link feature

See merge request artica/pandorafms!3665
 2020-12-22 16:30:44 +01:00
Daniel Rodriguez b2363fb003 Merge branch 'ent-6509-agent-details-error-en-conteo-total-de-modulos' into 'develop' 
included not init modules in total count

See merge request artica/pandorafms!3645
 2020-12-22 16:29:39 +01:00
Daniel Rodriguez 4b0fb7e762 Merge branch 'ent-6404-Bug-en-widget-Consolas-visuales-en-dashboard' into 'develop' 
fix dashboard VC

See merge request artica/pandorafms!3650
 2020-12-22 16:05:21 +01:00
Daniel Rodriguez ee84644163 Merge branch 'ent-6687-Instalador-en-metaconsola' into 'develop' 
fix check install meta

See merge request artica/pandorafms!3666
 2020-12-22 13:48:13 +01:00
Daniel Rodriguez ad1ede437c Merge branch 'ent-5983-Bugs-y-cambios-en-el-nuevo-tree-view' into 'develop' 
changes in treeview

See merge request artica/pandorafms!3654
 2020-12-22 13:02:17 +01:00
Daniel Rodriguez 58dd0b424c Merge branch 'ent-6675-Bug-items-de-consolas-visuales-en-metaconsola' into 'develop' 
fix bugs vc serialez module string donuts and bars charts

See merge request artica/pandorafms!3642
 2020-12-22 12:43:09 +01:00
Daniel Rodriguez 68c41ba704 Merge branch 'ent-6727-SAP-View-fallos' into 'develop' 
Fix

Closes pandora_enterprise#6727

See merge request artica/pandorafms!3627
 2020-12-22 12:42:16 +01:00
artica 1d72913310 Auto-updated build strings. 2020-12-22 01:00:16 +01:00
Luis Calvo 210f2057cd Removes event_statistics view 2020-12-21 17:56:24 +01:00
Daniel Rodriguez efb4dabd18 Merge branch 'ent-6632-Bug-dashboard-favorito-cuando-no-lo-es' into 'develop' 
fixed query

See merge request artica/pandorafms!3602
 2020-12-21 12:02:47 +01:00
artica da07c5d7da Auto-updated build strings. 2020-12-21 01:00:14 +01:00
artica 42f7183c7b Auto-updated build strings. 2020-12-20 01:00:15 +01:00
artica 37fda15ad4 Auto-updated build strings. 2020-12-19 01:00:18 +01:00
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
artica 87ce193c10 Auto-updated build strings. 2020-12-18 01:00:19 +01:00
Daniel Rodriguez 30650abaf0 Merge branch 'ent-6628-Titulo-y-subtitulos-borrados-en-la-open' into 'develop' 
Ent 6628 titulo y subtitulos borrados en la open

See merge request artica/pandorafms!3669
 2020-12-17 17:06:05 +01:00
Daniel Rodriguez 2591d8874a Merge branch 'ent-6804-buscador-pandora-permite-acceder-politicas-open' into 'develop' 
Ent 6804 buscador pandora permite acceder politicas open

Closes pandora_enterprise#6804

See merge request artica/pandorafms!3688
 2020-12-17 17:05:26 +01:00