Skip to content

Commit e0b7005

Browse files
committed
Merge branch 'release/5.5.0'
2 parents 423a6b8 + 8efc35e commit e0b7005

File tree

163 files changed

+4165
-630
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+4165
-630
lines changed

.devcontainer/devcontainer.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"name": "Website editing",
3+
"image": "python:3.13.1-slim-bookworm",
4+
"workspaceMount": "source=${localWorkspaceFolder}/docs,target=/docs,type=bind",
5+
"workspaceFolder": "/docs",
6+
7+
// Features to add to the dev container. More info: https://containers.dev/features.
8+
"features": {},
9+
10+
"forwardPorts": [
11+
8000
12+
],
13+
14+
"postCreateCommand": "pip install -r requirements.txt",
15+
16+
"customizations": {
17+
"vscode": {
18+
"settings": {
19+
"terminal.integrated.shell.linux": "/bin/bash",
20+
},
21+
"extensions": [
22+
"davidanson.vscode-markdownlint"
23+
]
24+
}
25+
}
26+
}

.gitattributes

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Enforce Windows newlines for C# files to be aligned with editorconfig.
22
*.cs text eol=crlf
3-
43
*.cs diff=csharp
4+
# Binary files tracked by LFS
5+
*.gif filter=lfs diff=lfs merge=lfs -text
6+
*.jpg filter=lfs diff=lfs merge=lfs -text
7+
*.png filter=lfs diff=lfs merge=lfs -text

.vscode/launch.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"type": "node",
9+
"request": "launch",
10+
"name": "Launch Program",
11+
"skipFiles": [
12+
"<node_internals>/**"
13+
],
14+
"program": "${file}"
15+
}
16+
]
17+
}

docs/.vscode/launch.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "Preview Website",
6+
"type": "chrome",
7+
"request": "launch",
8+
"url": "http://127.0.0.1:8000",
9+
"preLaunchTask": "mkdocs-serve",
10+
"postDebugTask": "mkdocs-stop"
11+
}
12+
]
13+
}

docs/.vscode/tasks.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "mkdocs-serve",
6+
"type": "shell",
7+
"isBackground": true,
8+
"command": "mkdocs serve",
9+
"problemMatcher": {
10+
"owner": "custom",
11+
"pattern": {
12+
"regexp": "^.*(Error|Except).*$"
13+
},
14+
"background": {
15+
"activeOnStart": true,
16+
"beginsPattern": ".*Building documentation.*",
17+
"endsPattern": ".*Serving on.*"
18+
}
19+
}
20+
},
21+
{
22+
"label": "mkdocs-stop",
23+
"type": "shell",
24+
"command": "${command:workbench.action.terminal.kill}"
25+
}
26+
]
27+
}

docs/input/documentation/contributing/how-to-build.md

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,49 @@ To run only part of the build a task can be passed using the `--target=<TASK>` s
3939

4040
## Building and running website locally
4141

42-
Ensure the following prerequisites are fulfilled:
43-
44-
* Latest .NET version installed
45-
* Python 3 installed
46-
47-
To build and serve the website [Cake]{target="_blank"} is used:
48-
49-
=== ":material-microsoft-windows: Windows"
50-
51-
```powershell
52-
.\build.ps1 --target=website
53-
```
54-
55-
=== ":material-apple: macOS"
56-
57-
```bash
58-
./build.sh --target=website
59-
```
60-
61-
=== ":material-linux: Linux"
62-
63-
```bash
64-
./build.sh --target=website
65-
```
66-
67-
Website is available on `http://127.0.0.1:8000/`
42+
=== "Using Visual Studio Code Dev Container"
43+
44+
For building and running website locally a [Visual Studio Code Dev Container]{target="_blank"} can be used.
45+
46+
Follow [installation instructions]{target="_blank"} to setup prerequisites.
47+
48+
To build and serve the website follow these steps:
49+
50+
* Clone and open the repository in Visual Studio Code
51+
* Open the website Dev Container: ++f1++ :material-arrow-right: `Dev Containers: Reopen in Container`
52+
* Start website in preview mode: ++f5++
53+
54+
Website preview will be opened in Chrome.
55+
56+
=== "Running on local machine"
57+
58+
Ensure the following prerequisites are fulfilled:
59+
60+
* Latest .NET version installed
61+
* Python 3 installed
62+
63+
To build and serve the website [Cake]{target="_blank"} is used:
64+
65+
=== ":material-microsoft-windows: Windows"
66+
67+
```powershell
68+
.\build.ps1 --target=website
69+
```
70+
71+
=== ":material-apple: macOS"
72+
73+
```bash
74+
./build.sh --target=website
75+
```
76+
77+
=== ":material-linux: Linux"
78+
79+
```bash
80+
./build.sh --target=website
81+
```
82+
83+
Website is available on `http://127.0.0.1:8000/`
6884

6985
[Cake]: https://cakebuild.net/
86+
[Visual Studio Code Dev Container]: https://code.visualstudio.com/docs/devcontainers/containers
87+
[installation instructions]: https://code.visualstudio.com/docs/devcontainers/containers#_installation
Loading
Loading
Loading
Loading

docs/input/documentation/report-formats/generic/templates/htmldatatable.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ This template doesn't support any options.
5959

6060
## Source Code
6161

62-
!!! info
62+
!!! tip
6363
You can use the source code as a template for your [custom template].
6464

65-
Source code is available on [GitHub](https://github.com/cake-contrib/Cake.Issues.Reporting.Generic/blob/develop/src/Cake.Issues.Reporting.Generic/Templates/DataTable.cshtml){target="_blank"}.
65+
Source code is available on [GitHub](https://github.com/cake-contrib/Cake.Issues/blob/develop/src/Cake.Issues.Reporting.Generic/Templates/DataTable.cshtml){target="_blank"}.
6666

6767
[custom template]: ../examples/custom-template.md
Loading

docs/input/documentation/report-formats/generic/templates/htmldiagnostic.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ This template doesn't support any options.
5454

5555
## Source Code
5656

57-
!!! info
57+
!!! tip
5858
You can use the source code as a template for your [custom template].
5959

60-
Source code is available on [GitHub](https://github.com/cake-contrib/Cake.Issues.Reporting.Generic/blob/develop/src/Cake.Issues.Reporting.Generic/Templates/Diagnostic.cshtml){target="_blank"}.
60+
Source code is available on [GitHub](https://github.com/cake-contrib/Cake.Issues/blob/develop/src/Cake.Issues.Reporting.Generic/Templates/Diagnostic.cshtml){target="_blank"}.
6161

6262
[custom template]: ../examples/custom-template.md
Loading

docs/input/documentation/report-formats/generic/templates/htmldxdatagrid-demo-additionalcolumns.html

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,30 @@
1010
<title>Issues Report</title>
1111

1212
<script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-3.7.1.min.js"></script>
13-
<link rel="stylesheet" type="text/css" href="https://cdn3.devexpress.com/jslib/23.1.11/css/dx.common.css" />
14-
<link rel="stylesheet" type="text/css" href="https://cdn3.devexpress.com/jslib/23.1.11/css/dx.light.css" />
15-
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/23.1.11/js/dx.all.js"></script>
13+
<link rel="stylesheet" type="text/css" href="https://cdn3.devexpress.com/jslib/23.1.13/css/dx.common.css" />
14+
<link rel="stylesheet" type="text/css" href="https://cdn3.devexpress.com/jslib/23.1.13/css/dx.light.css" />
15+
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/23.1.13/js/dx.all.js"></script>
1616

1717
<style>
18+
html, body {
19+
height: 100%;
20+
margin: 0;
21+
padding: 0;
22+
}
23+
.container {
24+
display: flex;
25+
flex-direction: column;
26+
height: 100%;
27+
}
28+
#gridContainer {
29+
flex: 1;
30+
overflow: auto;
31+
}
32+
.dx-theme-material-typography h1
33+
{
34+
font-weight: 200;
35+
font-size: 34px;
36+
}
1837
td[role=gridcell] .dx-menu-item-popout
1938
{
2039
display: none;
@@ -30,9 +49,8 @@
3049
</style>
3150
</head>
3251
<body class="dx-viewport">
33-
<h1>Issues Report</h1>
34-
3552
<div class="container">
53+
<h1>Issues Report</h1>
3654
<div id="gridContainer"></div>
3755
</div>
3856

@@ -49,6 +67,18 @@ <h1>Issues Report</h1>
4967
loadPanel: {
5068
enabled: true
5169
},
70+
stateStoring: {
71+
enabled: true,
72+
type: 'localStorage',
73+
storageKey: 'CakeIssuesReportingGeneric',
74+
},
75+
76+
pager: {
77+
showPageSizeSelector: true
78+
},
79+
columnChooser: {
80+
enabled: true
81+
},
5282
searchPanel: {
5383
visible: true
5484
},
@@ -66,6 +96,8 @@ <h1>Issues Report</h1>
6696
mode: "multiple"
6797
},
6898
rowAlternationEnabled: true,
99+
wordWrapEnabled: true,
100+
columnAutoWidth: true,
69101
allowColumnResizing: true,
70102
columns: [
71103

docs/input/documentation/report-formats/generic/templates/htmldxdatagrid-demo-changetitle.html

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,30 @@
1010
<title>My Custom Title</title>
1111

1212
<script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-3.7.1.min.js"></script>
13-
<link rel="stylesheet" type="text/css" href="https://cdn3.devexpress.com/jslib/23.1.11/css/dx.common.css" />
14-
<link rel="stylesheet" type="text/css" href="https://cdn3.devexpress.com/jslib/23.1.11/css/dx.light.css" />
15-
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/23.1.11/js/dx.all.js"></script>
13+
<link rel="stylesheet" type="text/css" href="https://cdn3.devexpress.com/jslib/23.1.13/css/dx.common.css" />
14+
<link rel="stylesheet" type="text/css" href="https://cdn3.devexpress.com/jslib/23.1.13/css/dx.light.css" />
15+
<script type="text/javascript" src="https://cdn3.devexpress.com/jslib/23.1.13/js/dx.all.js"></script>
1616

1717
<style>
18+
html, body {
19+
height: 100%;
20+
margin: 0;
21+
padding: 0;
22+
}
23+
.container {
24+
display: flex;
25+
flex-direction: column;
26+
height: 100%;
27+
}
28+
#gridContainer {
29+
flex: 1;
30+
overflow: auto;
31+
}
32+
.dx-theme-material-typography h1
33+
{
34+
font-weight: 200;
35+
font-size: 34px;
36+
}
1837
td[role=gridcell] .dx-menu-item-popout
1938
{
2039
display: none;
@@ -30,9 +49,8 @@
3049
</style>
3150
</head>
3251
<body class="dx-viewport">
33-
<h1>My Custom Title</h1>
34-
3552
<div class="container">
53+
<h1>My Custom Title</h1>
3654
<div id="gridContainer"></div>
3755
</div>
3856

@@ -49,6 +67,18 @@ <h1>My Custom Title</h1>
4967
loadPanel: {
5068
enabled: true
5169
},
70+
stateStoring: {
71+
enabled: true,
72+
type: 'localStorage',
73+
storageKey: 'CakeIssuesReportingGeneric',
74+
},
75+
76+
pager: {
77+
showPageSizeSelector: true
78+
},
79+
columnChooser: {
80+
enabled: true
81+
},
5282
searchPanel: {
5383
visible: true
5484
},
@@ -66,6 +96,8 @@ <h1>My Custom Title</h1>
6696
mode: "multiple"
6797
},
6898
rowAlternationEnabled: true,
99+
wordWrapEnabled: true,
100+
columnAutoWidth: true,
69101
allowColumnResizing: true,
70102
columns: [
71103

0 commit comments

Comments
 (0)