Browse Source

Merge branch 'release/4.x'

pull/596/head 5.3.0
Sebastian 5 years ago
parent
commit
80b546fbde
  1. 2
      Dockerfile
  2. 7
      backend/NuGet.Config
  3. 2
      backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  4. 2
      frontend/app/features/assets/pages/assets-page.component.html

2
Dockerfile

@ -8,7 +8,7 @@ ARG SQUIDEX__VERSION=4.0.0
WORKDIR /src WORKDIR /src
# Copy nuget project files. # Copy nuget project files.
COPY backend/*.sln backend/NuGet.Config ./ COPY backend/*.sln ./
# Copy the main source project files # Copy the main source project files
COPY backend/src/*/*.csproj ./ COPY backend/src/*/*.csproj ./

7
backend/NuGet.Config

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="myget.org" value="https://www.myget.org/F/jint/api/v3/index.json" protocolVersion="3" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>

2
backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj

@ -18,12 +18,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Fluid.Core.Squidex" Version="1.0.0-beta" /> <PackageReference Include="Fluid.Core.Squidex" Version="1.0.0-beta" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.24" /> <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="Markdig" Version="0.22.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
<PackageReference Include="Microsoft.OData.Core" Version="7.7.2" /> <PackageReference Include="Microsoft.OData.Core" Version="7.7.2" />
<PackageReference Include="NJsonSchema" Version="10.2.2" /> <PackageReference Include="NJsonSchema" Version="10.2.2" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" /> <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="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" /> <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />

2
frontend/app/features/assets/pages/assets-page.component.html

@ -57,7 +57,7 @@
<ng-container content> <ng-container content>
<sqx-list-view [isLoading]="assetsState.isLoading | async"> <sqx-list-view [isLoading]="assetsState.isLoading | async">
<ng-container header> <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> </ng-container>
<div content> <div content>

Loading…
Cancel
Save