Merge branch 'v13/dev' into contrib
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
@inject IOptions<GlobalSettings> globalSettings
|
||||
@inject IRuntimeMinifier runtimeMinifier
|
||||
@inject IProfilerHtml profilerHtml
|
||||
@inject IBackOfficeExternalLoginProviders externalLogins
|
||||
@{
|
||||
bool.TryParse(Context.Request.Query["umbDebug"], out bool isDebug);
|
||||
var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
|
||||
@@ -113,6 +114,8 @@
|
||||
|
||||
<script>
|
||||
document.angularReady = function(app) {
|
||||
@await Html.AngularValueExternalLoginInfoScriptAsync(externalLogins, ViewData.GetExternalSignInProviderErrors()!)
|
||||
@Html.AngularValueResetPasswordCodeInfoScript(ViewData[ViewDataExtensions.TokenPasswordResetCode]!)
|
||||
@await Html.AngularValueTinyMceAssetsAsync(runtimeMinifier)
|
||||
//required for the noscript trick
|
||||
document.getElementById("mainwrapper").style.display = "inherit";
|
||||
@@ -129,3 +132,4 @@
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
|
||||
"version": "13.2.0-rc",
|
||||
"version": "13.2.0-rc2",
|
||||
"assemblyVersion": {
|
||||
"precision": "build"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user