From 9c6f5579245fbb4be99c8be060280cf21c1daec5 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 29 Oct 2020 22:06:58 +0100 Subject: [PATCH 1/4] UI fix. --- frontend/app/features/assets/pages/assets-page.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/app/features/assets/pages/assets-page.component.html b/frontend/app/features/assets/pages/assets-page.component.html index dfbf11c23..1e52189ea 100644 --- a/frontend/app/features/assets/pages/assets-page.component.html +++ b/frontend/app/features/assets/pages/assets-page.component.html @@ -57,7 +57,7 @@ - +
From 6713b3646ffbeaa9015b0351edd9bfb172a8d331 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 30 Oct 2020 10:59:54 +0100 Subject: [PATCH 2/4] Custom jint package. --- backend/NuGet.Config | 7 ------- .../Squidex.Domain.Apps.Core.Operations.csproj | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 backend/NuGet.Config diff --git a/backend/NuGet.Config b/backend/NuGet.Config deleted file mode 100644 index b49f363c2..000000000 --- a/backend/NuGet.Config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file 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 index c8fb3c484..d0b05f115 100644 --- 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 @@ - + From a9991b546c24f12a7aad7df94693a9e4ac320e3a Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 30 Oct 2020 11:21:25 +0100 Subject: [PATCH 3/4] Do not copy nuget.config. --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index cbcaac61c..6d05d1ea1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,6 @@ ARG SQUIDEX__VERSION=4.0.0 WORKDIR /src -# Copy nuget project files. -COPY backend/*.sln backend/NuGet.Config ./ - # Copy the main source project files COPY backend/src/*/*.csproj ./ RUN for file in $(ls *.csproj); do mkdir -p src/${file%.*}/ && mv $file src/${file%.*}/; done From 4c1db1fe4bb798491382f5b13255ddbcd4533939 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 30 Oct 2020 11:27:05 +0100 Subject: [PATCH 4/4] Fix Dockerfile again --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6d05d1ea1..88d8830a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,9 @@ ARG SQUIDEX__VERSION=4.0.0 WORKDIR /src +# Copy nuget project files. +COPY backend/*.sln ./ + # Copy the main source project files COPY backend/src/*/*.csproj ./ RUN for file in $(ls *.csproj); do mkdir -p src/${file%.*}/ && mv $file src/${file%.*}/; done