Merge branch 'dev' into abpio-community-talks

build/common.ps1

@@ -7,7 +7,6 @@ $rootFolder = (Get-Item -Path "./" -Verbose).FullName
 # List of solutions used only in development mode
 $solutionPaths = @(
 		"../framework",
-		"../studio",
 		"../modules/basic-theme",
 		"../modules/users",
 		"../modules/permission-management",

framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs

@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
@@ -18,6 +20,8 @@ public class AppUrlProvider : IAppUrlProvider, ITransientDependency
     protected ICurrentTenant CurrentTenant { get; }
     protected ITenantStore TenantStore { get; }
 
+    public ILogger<AppUrlProvider> Logger { get; set; }
+
     public AppUrlProvider(
         IOptions<AppUrlOptions> options,
         ICurrentTenant currentTenant,
@@ -26,6 +30,7 @@ public class AppUrlProvider : IAppUrlProvider, ITransientDependency
         CurrentTenant = currentTenant;
         TenantStore = tenantStore;
         Options = options.Value;
+        Logger = NullLogger<AppUrlProvider>.Instance;
     }
 
     public virtual async Task<string> GetUrlAsync(string appName, string urlName = null)
@@ -40,7 +45,12 @@ public class AppUrlProvider : IAppUrlProvider, ITransientDependency
 
     public bool IsRedirectAllowedUrl(string url)
     {
-        return Options.RedirectAllowedUrls.Any(url.StartsWith);
+        var allow = Options.RedirectAllowedUrls.Any(url.StartsWith);
+        if (!allow)
+        {
+            Logger.LogError($"Invalid RedirectUrl: {url}, Use {nameof(AppUrlProvider)} to configure it!");
+        }
+        return allow;
     }
 
     protected virtual async Task<string> GetConfiguredUrl(string appName, string urlName)

modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js

@@ -124,18 +124,15 @@
     });
 
     function handleCustomScrolls() {
-        var wWidth = $(window).width();
+        $('#sidebar-scroll').mCustomScrollbar({
-        if (wWidth > 766) {
+            theme: 'minimal',
-            $('#sidebar-scroll').mCustomScrollbar({
+            alwaysShowScrollbar: 0,
-                theme: 'minimal',
+        });
-                alwaysShowScrollbar: 0,
-            });
 
-            $('#scroll-index').mCustomScrollbar({
+        $('#scroll-index').mCustomScrollbar({
-                theme: 'minimal-dark',
+            theme: 'minimal-dark',
-                alwaysShowScrollbar: 0,
+            alwaysShowScrollbar: 0,
-            });
+        });
-        }
     }
 
     window.Toc.helpers.createNavList = function () {