Skip to content

Commit 657de61

Browse files
JimBobSquarePantsJimBobSquarePants
committed
Merge branch 'main' into js/optimize-pixel-memory
2 parents 2cb7763 + 4f0fe2b commit 657de61

31 files changed

Lines changed: 1331 additions & 117 deletions

‎.github/CONTRIBUTING.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# How to contribute to ImageSharp.Web
1+
# How to contribute to SixLabors.ImageSharp.Web
22

33
#### **Did you find a bug?**
44

@@ -16,20 +16,18 @@
1616

1717
#### **Do you intend to add a new feature or change an existing one?**
1818

19-
* Suggest your change in the [ImageSharp Gitter Chat Room](https://gitter.im/ImageSharp/General) and start writing code.
19+
* Suggest your change in the [Ideas Discussions Channel](https://github.com/SixLabors/ImageSharp.Web/discussions?discussions_q=category%3AIdeas) and start writing code.
2020

2121
* Do not open an issue on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes.
2222

2323
#### **Do you have questions about consuming the library or the source code?**
2424

25-
* Ask any question about how to use ImageSharp in the [ImageSharp Gitter Chat Room](https://gitter.im/ImageSharp/General).
25+
* Ask any question about how to use SixLabors.ImageSharp.Web in the [Help Discussions Channel](https://github.com/SixLabors/ImageSharp.Web/discussions?discussions_q=category%3AHelp).
2626

27-
#### Code of Conduct
27+
#### Code of Conduct
2828
This project has adopted the code of conduct defined by the [Contributor Covenant](https://contributor-covenant.org/) to clarify expected behavior in our community.
2929
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
3030

31-
And please remember. ImageSharp.Web is the work of a very, very, small number of developers who struggle balancing time to contribute to the project with family time and work commitments. We encourage you to pitch in and help make our vision of simple accessible imageprocessing available to all. Open Source can only exist with your help.
31+
And please remember. SixLabors.ImageSharp.Web is the work of a very, very, small number of developers who struggle balancing time to contribute to the project with family time and work commitments. We encourage you to pitch in and help make our vision of simple accessible image processing available to all. Open Source can only exist with your help.
3232

3333
Thanks for reading!
34-
35-
James Jackson-South :heart:

‎.github/ISSUE_TEMPLATE/commercial-bug-report.md‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/commercial-bug-report.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: "Commercial License : Bug Report"
2+
description: |
3+
Create a report to help us improve the project. For Commercial License holders only.
4+
Please contact help@sixlabors.com for issues requiring private support.
5+
labels: ["commercial", "needs triage"]
6+
body:
7+
- type: checkboxes
8+
attributes:
9+
label: Prerequisites
10+
options:
11+
- label: I have bought a Commercial License
12+
required: true
13+
- label: I have written a descriptive issue title
14+
required: true
15+
- label: I have verified that I am running the latest version of ImageSharp.Web
16+
required: true
17+
- label: I have verified if the problem exist in both `DEBUG` and `RELEASE` mode
18+
required: true
19+
- label: I have searched [open](https://github.com/SixLabors/ImageSharp.Web/issues) and [closed](https://github.com/SixLabors/ImageSharp.Web/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
20+
required: true
21+
- type: input
22+
attributes:
23+
label: ImageSharp.Web version
24+
validations:
25+
required: true
26+
- type: input
27+
attributes:
28+
label: Other Six Labors packages and versions
29+
validations:
30+
required: true
31+
- type: input
32+
attributes:
33+
label: Environment (Operating system, version and so on)
34+
validations:
35+
required: true
36+
- type: input
37+
attributes:
38+
label: .NET Framework version
39+
validations:
40+
required: true
41+
- type: textarea
42+
attributes:
43+
label: Description
44+
description: A description of the bug
45+
validations:
46+
required: true
47+
- type: textarea
48+
attributes:
49+
label: Steps to Reproduce
50+
description: List of steps, sample code, failing test or link to a project that reproduces the behavior. Make sure you place a stack trace inside a code (```) block to avoid linking unrelated issues.
51+
validations:
52+
required: true
53+
- type: textarea
54+
attributes:
55+
label: Images
56+
description: Please upload images that can be used to reproduce issues in the area below. If the file type is not supported the file can be zipped and then uploaded instead.

‎.github/ISSUE_TEMPLATE/oss-bug-report.md‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/oss-bug-report.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: "OSS : Bug Report"
2+
description: Create a report to help us improve the project. OSS Issues are not guaranteed to be triaged.
3+
labels: ["needs triage"]
4+
body:
5+
- type: checkboxes
6+
attributes:
7+
label: Prerequisites
8+
options:
9+
- label: I have written a descriptive issue title
10+
required: true
11+
- label: I have verified that I am running the latest version of ImageSharp.Web
12+
required: true
13+
- label: I have verified if the problem exist in both `DEBUG` and `RELEASE` mode
14+
required: true
15+
- label: I have searched [open](https://github.com/SixLabors/ImageSharp.Web/issues) and [closed](https://github.com/SixLabors/ImageSharp.Web/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
16+
required: true
17+
- type: input
18+
attributes:
19+
label: ImageSharp.Web version
20+
validations:
21+
required: true
22+
- type: input
23+
attributes:
24+
label: Other Six Labors packages and versions
25+
validations:
26+
required: true
27+
- type: input
28+
attributes:
29+
label: Environment (Operating system, version and so on)
30+
validations:
31+
required: true
32+
- type: input
33+
attributes:
34+
label: .NET Framework version
35+
validations:
36+
required: true
37+
- type: textarea
38+
attributes:
39+
label: Description
40+
description: A description of the bug
41+
validations:
42+
required: true
43+
- type: textarea
44+
attributes:
45+
label: Steps to Reproduce
46+
description: List of steps, sample code, failing test or link to a project that reproduces the behavior. Make sure you place a stack trace inside a code (```) block to avoid linking unrelated issues.
47+
validations:
48+
required: true
49+
- type: textarea
50+
attributes:
51+
label: Images
52+
description: Please upload images that can be used to reproduce issues in the area below. If the file type is not supported the file can be zipped and then uploaded instead.

‎.github/workflows/build-and-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ name: Build
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
tags:
88
- "v*"
99
pull_request:
1010
branches:
11-
- master
11+
- main
1212

1313
jobs:
1414
Build:

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<h1 align="center">
22

3-
<img src="https://raw.githubusercontent.com/SixLabors/Branding/master/icons/imagesharp.web/sixlabors.imagesharp.web.svg?sanitize=true" alt="SixLabors.ImageSharp.Web" width="256"/>
3+
<img src="https://raw.githubusercontent.com/SixLabors/Branding/main/icons/imagesharp.web/sixlabors.imagesharp.web.svg?sanitize=true" alt="SixLabors.ImageSharp.Web" width="256"/>
44
<br/>
55
SixLabors.ImageSharp.Web
66
</h1>
77

88
<div align="center">
99

10-
[![Build Status](https://img.shields.io/github/workflow/status/SixLabors/ImageSharp.Web/Build/master)](https://github.com/SixLabors/ImageSharp.Web/actions)
11-
[![Code coverage](https://codecov.io/gh/SixLabors/ImageSharp.Web/branch/master/graph/badge.svg)](https://codecov.io/gh/SixLabors/ImageSharp.Web)
10+
[![Build Status](https://img.shields.io/github/workflow/status/SixLabors/ImageSharp.Web/Build/main)](https://github.com/SixLabors/ImageSharp.Web/actions)
11+
[![Code coverage](https://codecov.io/gh/SixLabors/ImageSharp.Web/branch/main/graph/badge.svg)](https://codecov.io/gh/SixLabors/ImageSharp.Web)
1212
[![License: Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
1313
[![GitHub issues](https://img.shields.io/github/issues/SixLabors/ImageSharp.Web.svg)](https://github.com/SixLabors/ImageSharp.Web/issues)
1414

@@ -38,7 +38,7 @@ Support the efforts of the development of the Six Labors projects.
3838
## Questions
3939

4040
- Do you have questions? We are happy to help! Please [join our Discussions Forum](https://github.com/SixLabors/ImageSharp/discussions/category_choices), or ask them on [Stack Overflow](https://stackoverflow.com) using the `ImageSharp.Web` tag. Please do not open issues for questions.
41-
- Please read our [Contribution Guide](https://github.com/SixLabors/ImageSharp.Web/blob/master/.github/CONTRIBUTING.md) before opening issues or pull requests!
41+
- Please read our [Contribution Guide](https://github.com/SixLabors/ImageSharp.Web/blob/main/.github/CONTRIBUTING.md) before opening issues or pull requests!
4242

4343

4444
## Code of Conduct
@@ -110,7 +110,7 @@ sudo s3rver -d . &
110110

111111
## How can you help?
112112

113-
Please... Spread the word, contribute algorithms, submit performance improvements, unit tests, no input is too little. Make sure to read our [Contribution Guide](https://github.com/SixLabors/ImageSharp.Web/blob/master/.github/CONTRIBUTING.md) before opening a PR.
113+
Please... Spread the word, contribute algorithms, submit performance improvements, unit tests, no input is too little. Make sure to read our [Contribution Guide](https://github.com/SixLabors/ImageSharp.Web/blob/main/.github/CONTRIBUTING.md) before opening a PR.
114114

115115
## The ImageSharp.Web Team
116116

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_0.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_1.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

‎samples/ImageSharp.Web.Sample/wwwroot/Landscape_2.jpg‎

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)