Skip to content

Commit ef2a173

Browse files
StrykeSlammerIIStrykeSlammerII
authored
Merge branch 'userfrosting:5.1' into patch-2
2 parents 57062ed + 6e39c60 commit ef2a173

File tree

59 files changed

+789
-413
lines changed

Some content is hidden

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

59 files changed

+789
-413
lines changed

‎.github/ISSUE_TEMPLATE/Documentation_error.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Documentation error
2+
description: Something is wrong in the doc
3+
body:
4+
- type: input
5+
attributes:
6+
label: UserFrosting Version
7+
description: Provide the UserFrosting affected
8+
placeholder: 5.x.x
9+
validations:
10+
required: true
11+
- type: input
12+
attributes:
13+
label: Affected page
14+
description: Provide a link to the page this is related to
15+
placeholder: https://learn.userfrosting.com/...
16+
validations:
17+
required: true
18+
- type: textarea
19+
attributes:
20+
label: Description
21+
description: Provide a detailed description of the error.
22+
validations:
23+
required: true

‎.github/ISSUE_TEMPLATE/Documentation_improvement_suggestion.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Documentation improvement suggestion
2+
description: Something in the doc needs improvement
3+
body:
4+
- type: input
5+
attributes:
6+
label: UserFrosting Version
7+
description: Provide the UserFrosting affected
8+
placeholder: 5.x.x
9+
validations:
10+
required: true
11+
- type: input
12+
attributes:
13+
label: Affected page
14+
description: Provide a link to the page this is related to
15+
placeholder: https://learn.userfrosting.com/...
16+
validations:
17+
required: true
18+
- type: textarea
19+
attributes:
20+
label: Description
21+
description: Provide a detailed description of the problem
22+
validations:
23+
required: true
24+
- type: textarea
25+
attributes:
26+
label: Suggested Changes
27+
description: Provide details about the suggested changes
28+
validations:
29+
required: true

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ ehthumbs.db
44
Icon?
55
Thumbs.db
66
*.swp
7-
.vscode
87

98
# Custom
109
_meta

‎.lando.dist.sh‎

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

‎.lando.dist.yml‎

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

‎.vscode/extensions.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"recommendations": [
3+
"streetsidesoftware.code-spell-checker",
4+
"bierner.markdown-preview-github-styles",
5+
"fcrespo82.markdown-table-formatter"
6+
]
7+
}

‎.vscode/settings.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"cSpell.diagnosticLevel": "Information",
3+
"cSpell.words": [
4+
"autowire",
5+
"Birke",
6+
"charette",
7+
"Grav",
8+
"Laravel",
9+
"Mele",
10+
"middlewares",
11+
"phpstan",
12+
"Phpunit",
13+
"Rememberme",
14+
"Sprunje",
15+
"UserFrosting",
16+
"weissman"
17+
],
18+
}

‎.vscode/tasks.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "Docker Build",
6+
"type": "shell",
7+
"command": "docker build -t learn:latest .",
8+
"problemMatcher": [],
9+
"group": "build"
10+
},
11+
{
12+
"label": "Launch Docker",
13+
"type": "shell",
14+
"command": "docker run -d --rm --name=learn -p 8888:80 -v \"$(pwd):/var/www/grav/user\" learn:latest",
15+
"problemMatcher": [],
16+
"group": "build"
17+
},
18+
{
19+
"label": "Launch Docker (No Destroy)",
20+
"type": "shell",
21+
"command": "docker run -d --name=learn -p 8080:80 -v \"$(pwd):/var/www/grav/user\" learn:latest",
22+
"problemMatcher": [],
23+
"group": "build"
24+
},
25+
{
26+
"label": "Stop Docker",
27+
"type": "shell",
28+
"command": "docker stop learn",
29+
"problemMatcher": [],
30+
"group": "build"
31+
},
32+
{
33+
"label": "Access Docker",
34+
"type": "shell",
35+
"command": "docker exec -it learn bash",
36+
"problemMatcher": [],
37+
"group": "build"
38+
}
39+
]
40+
}

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,8 @@ UserFrosting documentation is written in Markdown. Usual Markdown syntax is avai
1919

2020
## Pull Requests
2121

22-
Pull Requests for this repository should be created against the appropriate branch as per the table below. If you're unsure, just pick the branch that fits best and someone will take it from there.
23-
24-
| Change should be published | Branch to make PR against |
25-
|---|---|
26-
| current release | `master` |
27-
| next patch release | `hotfix` |
28-
| next breaking change release | `develop` |
29-
| previous release | `previous.vesion.branch` |
22+
Each minor version of UserFrosting has a corresponding branch on this repository. Pull Requests for this repository should be created against the appropriate branch/version. If you're unsure, just pick the main branch.
3023

3124
## Code contributions
3225

33-
Please direct your attention to the [UserFrosting contribution guide](https://github.com/userfrosting/UserFrosting/blob/master/.github/CONTRIBUTING.md)
26+
Please direct your attention to the [UserFrosting contribution guide](https://github.com/userfrosting/.github/blob/main/.github/CONTRIBUTING.md)

0 commit comments

Comments
 (0)