Skip to content
This repository was archived by the owner on Jul 7, 2026. It is now read-only.

Updates for .net 6, some fixes, and a new "Last N Days" filter #143

Merged
d4nt merged 26 commits into from
Nov 21, 2022
Merged

Updates for .net 6, some fixes, and a new "Last N Days" filter #143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
343268e
Issue #31 (Summarize Min and Max on Dates)
Sep 21, 2019
c954307
Merge branch 'master' into develop
Oct 13, 2019
4256909
Removed unused libraries
Oct 13, 2019
d6b6e7e
Fixed issue #80
Oct 13, 2019
c9a78c9
Fixed for issue #89
Nov 1, 2019
55c5054
Fixed issue with paging when a chart is shown
Nov 2, 2019
36104be
removed unnecessary space
Nov 5, 2019
fbe136d
Merge branch 'master' into develop
Nov 23, 2019
9905d4e
Upgrading to dotnet3.1 (issue #94)
Feb 16, 2020
22650d4
Updating CircleCI for dotnet 3.1
Feb 16, 2020
10be928
Updating to dotnet 3.1
Feb 16, 2020
11d0bb1
Initial implementation for issue #98 - a filter for "last N days"
Apr 8, 2020
4da8659
Update TeamController.cs
mateoayat Apr 14, 2020
a9cb356
Fixing issue #99 (thanks to @mateoayat)
Apr 28, 2020
2a01bac
Updating packages (related to issue #101)
Apr 28, 2020
b1fda96
Merge branch 'develop' into develop
Apr 28, 2020
c63e66f
Merge pull request #100 from mateoayat/develop
Apr 28, 2020
91a96d4
feat: reverse proxy support
PandelisZ Feb 5, 2021
fe8534a
Merge pull request #120 from d4software/reverse-proxy
Mar 10, 2021
253cfbb
Closes issue #118
Mar 10, 2021
49d0c5b
Merge branch 'develop' of github.com:d4software/QueryTree into develop
Mar 10, 2021
1b3892b
Merge branch 'master' of github.com:d4software/QueryTree into develop
Nov 21, 2022
b8efbe4
Updating for .net 6
Nov 21, 2022
8f38800
Styling updates and minor bug fixes
Nov 21, 2022
623155d
Fixing indentation
Nov 21, 2022
9436ab1
Adding logging to database query exceptions,
Nov 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updating to dotnet 3.1
  • Loading branch information
Daniel Thompson
Daniel Thompson committed Feb 16, 2020
commit 10be92851dc82ed3a5113e8e5ad102f107acc2db
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM microsoft/dotnet:2.2-sdk-stretch as builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder
WORKDIR /build
COPY . .
RUN dotnet restore
RUN dotnet publish --no-restore -c Release ./Web/QueryTree.csproj -o /dist

FROM microsoft/dotnet:2.2-aspnetcore-runtime as runtime
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 as runtime
WORKDIR /app
COPY --from=builder /dist .
COPY --from=builder /build/Web/EmailTemplates ./EmailTemplates
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ for more information.

### Prerequisites

To build binaries or run from source you need the [.NET Core SDK v2.2](https://www.microsoft.com/net/download) installed.
To build binaries or run from source you need the [.NET Core SDK v3.1](https://www.microsoft.com/net/download) installed.

### Running from Source

Expand Down Expand Up @@ -83,7 +83,7 @@ This will create a release folder in `dist` of all the unpacked QueryTree binari

### Running from Binaries

To run QueryTree on your server you will need to install the .NET Core 2.2.x runtime. (It is not necessary to install the full .NET SDK, just the runtime.) You can download the installer [here](https://www.microsoft.com/net/download/core#/runtime).
To run QueryTree on your server you will need to install the .NET Core 3.1.x runtime. (It is not necessary to install the full .NET SDK, just the runtime.) You can download the installer [here](https://www.microsoft.com/net/download/core#/runtime).

To verify that you have the .NET runtime installed, open a terminal/cmd window and type

Expand Down
1 change: 0 additions & 1 deletion Web/QueryTree.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<PackageReference Include="Hangfire.SQLite" Version="1.4.2" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.1" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
<PackageReference Include="Npgsql" Version="4.1.3" />
Expand Down