Merge branch 'release/4.x'

Squidex · Oct 30, 2020 · 80b546f · 80b546f
2 parents 240b9f9 + 4c1db1f
commit 80b546f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ ARG SQUIDEX__VERSION=4.0.0
 WORKDIR /src
 
 # Copy nuget project files.
-COPY backend/*.sln backend/NuGet.Config  ./
+COPY backend/*.sln ./
 
 # Copy the main source project files
 COPY backend/src/*/*.csproj ./

diff --git a/backend/NuGet.Config b/backend/NuGet.Config
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj b/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
@@ -18,12 +18,12 @@
   <ItemGroup>
     <PackageReference Include="Fluid.Core.Squidex" Version="1.0.0-beta" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
-    <PackageReference Include="Jint" Version="3.0.0-beta-1884" />
     <PackageReference Include="Markdig" Version="0.22.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
     <PackageReference Include="Microsoft.OData.Core" Version="7.7.2" />
     <PackageReference Include="NJsonSchema" Version="10.2.2" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
+    <PackageReference Include="Squidex.Jint" Version="3.0.0-beta-0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />

diff --git a/frontend/app/features/assets/pages/assets-page.component.html b/frontend/app/features/assets/pages/assets-page.component.html
@@ -57,7 +57,7 @@
     <ng-container content>
         <sqx-list-view [isLoading]="assetsState.isLoading | async">
             <ng-container header>
-                <sqx-asset-path [path]="assetsState.path | async" (navigate)="assetsState.navigate($event)"></sqx-asset-path>
+                <sqx-asset-path [path]="assetsState.path | async" (navigate)="assetsState.navigate($event.id)"></sqx-asset-path>
             </ng-container>
 
             <div content>