Skip to content

Commit 19712fe

Browse files
authored
Merge branch 'main' into fix-4620
2 parents 13f0ffa + 522325f commit 19712fe

File tree

85 files changed

+1524
-2346
lines changed

Some content is hidden

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

85 files changed

+1524
-2346
lines changed

.all-contributorsrc

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,8 @@
244244
"avatar_url": "https://avatars0.githubusercontent.com/u/2094614?v=4",
245245
"profile": "https://netalico.com/",
246246
"contributions": [
247-
"code"
247+
"code",
248+
"bug"
248249
]
249250
},
250251
{
@@ -1516,6 +1517,33 @@
15161517
"contributions": [
15171518
"code"
15181519
]
1520+
},
1521+
{
1522+
"login": "mbattistini",
1523+
"name": "mbattistini",
1524+
"avatar_url": "https://avatars.githubusercontent.com/u/276468?v=4",
1525+
"profile": "https://github.com/mbattistini",
1526+
"contributions": [
1527+
"bug"
1528+
]
1529+
},
1530+
{
1531+
"login": "justlife4x4",
1532+
"name": "justlife4x4",
1533+
"avatar_url": "https://avatars.githubusercontent.com/u/59994040?v=4",
1534+
"profile": "https://github.com/justlife4x4",
1535+
"contributions": [
1536+
"security"
1537+
]
1538+
},
1539+
{
1540+
"login": "fabianaromagnoli",
1541+
"name": "Fabiana Romagnoli",
1542+
"avatar_url": "https://avatars.githubusercontent.com/u/23638004?v=4",
1543+
"profile": "https://github.com/fabianaromagnoli",
1544+
"contributions": [
1545+
"bug"
1546+
]
15191547
}
15201548
],
15211549
"commitType": "docs"

.cypress.config.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module.exports = {
2+
e2e: {
3+
setupNodeEvents(on, config) {
4+
// implement node event listeners here
5+
},
6+
baseUrl: 'https://magento-lts.ddev.site'
7+
},
8+
};

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: 🐛 Bug report
2+
description: File a bug/issue
3+
title: "[BUG] <title>"
4+
labels: ["bug", "review needed"]
5+
body:
6+
- type: checkboxes
7+
attributes:
8+
label: Is there an existing issue for this?
9+
description: Please search to see if an issue already exists for the bug you encountered.
10+
options:
11+
- label: I have searched the existing issues
12+
required: true
13+
- type: textarea
14+
attributes:
15+
label: Current Behavior
16+
description: A concise description of what you're experiencing.
17+
validations:
18+
required: true
19+
- type: textarea
20+
attributes:
21+
label: Expected Behavior
22+
description: A concise description of what you expected to happen.
23+
validations:
24+
required: true
25+
- type: textarea
26+
attributes:
27+
label: Steps To Reproduce
28+
description: Steps to reproduce the behavior.
29+
placeholder: |
30+
1. In this environment...
31+
1. With this config...
32+
1. Run '...'
33+
1. See error...
34+
validations:
35+
required: true
36+
- type: textarea
37+
attributes:
38+
label: Environment
39+
description: |
40+
examples:
41+
- **OpenMage**: 20.12.2
42+
- **php**: 7.4
43+
value: |
44+
- OpenMage:
45+
- php:
46+
render: markdown
47+
validations:
48+
required: false
49+
- type: textarea
50+
attributes:
51+
label: Anything else?
52+
description: |
53+
Links? References? Anything that will give us more context about the issue you are encountering!
54+
55+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
56+
validations:
57+
required: false

.github/ISSUE_TEMPLATE/developer-experience-issue.md

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: 👀 Developer experience
2+
description: Issues related to customization, extensibility, modularity
3+
title: "<title>"
4+
labels: ["review needed"]
5+
body:
6+
- type: textarea
7+
attributes:
8+
label: Summary
9+
description: Describe the issue you are experiencing. Include general information, error messages, environments, and so on.
10+
validations:
11+
required: true
12+
- type: textarea
13+
attributes:
14+
label: Examples
15+
description: Provide code examples or a patch with a test (recommended) to clearly indicate the problem.
16+
validations:
17+
required: true
18+
- type: textarea
19+
attributes:
20+
label: Proposed solution
21+
description: Suggest your potential solutions for this issue.
22+
validations:
23+
required: false
24+
- type: textarea
25+
attributes:
26+
label: Anything else?
27+
description: |
28+
Links? References? Anything that will give us more context about the issue you are encountering!
29+
30+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
31+
validations:
32+
required: false

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: 🚀 Feature request
2+
description: Suggest an idea or feature request
3+
title: "[FEAT] <title>"
4+
labels: ["new feature", "review needed"]
5+
body:
6+
- type: checkboxes
7+
attributes:
8+
label: Is there an existing issue for this?
9+
description: Please search to see if an issue already exists for the bug you encountered.
10+
options:
11+
- label: I have searched the existing issues
12+
required: true
13+
- type: textarea
14+
attributes:
15+
label: Description
16+
description: Describe the feature you would like to add.
17+
validations:
18+
required: true
19+
- type: textarea
20+
attributes:
21+
label: Expected Behavior
22+
description: What is the expected behavior of this feature? How is it going to work?
23+
validations:
24+
required: true
25+
- type: textarea
26+
attributes:
27+
label: Benefits
28+
description: How do you think this feature would improve OpenMage?
29+
validations:
30+
required: false
31+
- type: textarea
32+
attributes:
33+
label: Anything else?
34+
description: |
35+
Links? References? Anything that will give us more context about the issue you are encountering!
36+
37+
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
38+
validations:
39+
required: false

.github/codeql-config.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
1-
21
paths-ignore:
2+
- 'js/extjs/ext-tree.js'
3+
- 'js/lib/jquery/jquery-1.12.4.js'
34
- 'js/prototype/prototype.js'
4-
- 'skin/frontend/rwd/default/js/lib/selectivizr.js'
5-
- 'js/mage/adminhtml/flexuploader.js'
6-
- 'js/mage/adminhtml/sales/packaging.js'
7-
- 'js/mage/adminhtml/uploader/instance.js'
8-
- 'js/mage/adminhtml/wysiwyg/tiny_mce/setup.js'
95
- 'js/prototype/validation.js'
10-
- 'js/tiny_mce/tiny_mce_dev.js'
11-
- 'js/tiny_mce/tiny_mce.js'
12-
- 'js/tiny_mce/tiny_mce_src.js'
13-
- 'js/tiny_mce/tiny_mce_jquery.js'
14-
- 'js/tiny_mce/tiny_mce_jquery_src.js'
15-
- 'js/tiny_mce/tiny_mce_prototype.js'
16-
- 'js/tiny_mce/tiny_mce_prototype_src.js'
17-
- 'js/tiny_mce/classes/**/*.js'
18-
- 'js/tiny_mce/utils/**/*.js'
19-
- 'js/tiny_mce/plugins/**/*.js'
20-
- 'js/lib/jquery/jquery-1.12.4.js'
21-
- 'js/extjs/ext-tree.js'
226
- '**/*.test.js'

.github/release-drafter.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name-template: 'v$RESOLVED_VERSION 🌈'
22
tag-template: 'v$RESOLVED_VERSION'
33
categories:
4+
- title: '🚨 Security'
5+
labels:
6+
- 'security'
47
- title: '🚀 Features'
58
labels:
69
- 'enhancement'
@@ -12,7 +15,7 @@ categories:
1215
- 'bug'
1316
- title: '📖 Documentation'
1417
labels:
15-
- 'Documentation'
18+
- 'documentation'
1619
- title: '🔨 Maintenance'
1720
labels:
1821
- 'chore'
@@ -41,4 +44,4 @@ version-resolver:
4144
template: |
4245
## Changes
4346
44-
$CHANGES
47+
$CHANGES

0 commit comments

Comments
 (0)