Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
PrestonN committed Nov 2, 2022
2 parents d959a45 + 1295501 commit 4fc5b47
Show file tree
Hide file tree
Showing 273 changed files with 12,388 additions and 7,407 deletions.
4 changes: 2 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"@babel/env",
{
"targets": {
"chrome": "96",
"node": 16
"chrome": "106",
"node": "16.16.0"
}
}
]
Expand Down
12 changes: 7 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@ module.exports = {
plugins: ['vue'],

rules: {
'space-before-function-paren': 0,
'space-before-function-paren': 'off',
'comma-dangle': ['error', 'never'],
'vue/no-v-html': 'off',
'no-console': 0,
'no-unused-vars': 1,
'no-undef': 1,
'vue/no-template-key': 1
'no-console': ['error', { allow: ['warn', 'error'] }],
'no-unused-vars': 'warn',
'no-undef': 'warn',
'vue/no-template-key': 'warn',
'vue/no-useless-template-attributes': 'off',
'vue/multi-word-component-names': 'off'
}
}
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ body:
options:
- label: I have encountered this bug in the [latest release of FreeTube](https://github.com/FreeTubeApp/FreeTube/releases).
required: true
- label: I have searched the [issue tracker](https://github.com/FreeTubeApp/FreeTube/issues) for a bug report that matches the one I want to file, without success.
- label: I have searched the [issue tracker](https://github.com/FreeTubeApp/FreeTube/issues) for open and closed issues that are similar to the bug report I want to file, without success.
required: true
- label: I have searched the [documentation](https://docs.freetubeapp.io/) for information that matches the description of the bug I want to file, without success.
required: true
Expand Down Expand Up @@ -85,10 +85,12 @@ body:
- .dmg
- .exe
- Flathub
- MPR
- .pacman
- Portable
- PortableApps
- .rpm
- Scoop
- winget
- .zip
- other
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ body:
label: Guidelines
description: Please ensure you've completed all of the following.
options:
- label: I have searched the [issue tracker](https://github.com/FreeTubeApp/FreeTube/issues) for a feature request that matches the one I want to file, without success.
- label: I have searched the [issue tracker](https://github.com/FreeTubeApp/FreeTube/issues) for open and closed issues that are similar to the feature request I want to file, without success.
required: true
- label: I have searched the [documentation](https://docs.freetubeapp.io/) for information that matches the description of the feature request I want to file, without success.
required: true
Expand Down
46 changes: 24 additions & 22 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
---
Title
---
# Title

**Important note**
We may remove your pull request if you do not use this provided PR template correctly.
<!-- Thanks for sending a pull request! Make sure to follow the contributing guidelines. -->
<!-- Important note, we may remove your pull request if you do not use this provided PR template correctly. -->

**Pull Request Type**
Please select what type of pull request this is:
## Pull Request Type
<!-- Please select what type of pull request this is: [x] -->
- [ ] Bugfix
- [ ] Feature Implementation
- [ ] Documentation
- [ ] Other

**Related issue**
Please link the issue your pull request is referring to. If this pull request fully resolves the relevant issue, put "closes" before the issue number. Example: "closes #123456".
## Related issue
<!-- Please link the issue your pull request is referring to. -->
<!-- If this pull request fully resolves the relevant issue, put "closes" before the issue number. -->
<!-- Example: "closes #123456". -->

**Description**
Please write a clear and concise description of what the pull request does.
## Description
<!-- Please write a clear and concise description of what the pull request does. -->

**Screenshots (if appropriate)**
Please add before and after screenshots if there is a visible change.
## Screenshots <!-- If appropriate -->
<!-- Please add before and after screenshots if there is a visible change. -->

**Testing (for code that is not small enough to be easily understandable)**
Has this pull request been tested?
Please describe shortly how you tested it and whether there are any ramifications remaining.
## Testing <!-- for code that is not small enough to be easily understandable -->
<!-- Has this pull request been tested? -->
<!-- Please describe shortly how you tested it. -->
<!-- Are there any ramifications remaining? -->

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- OS Version: [e.g. 22]
- FreeTube version: [e.g. 0.8]
## Desktop
<!-- Please complete the following information-->
- **OS:**
- **OS Version:**
- **FreeTube version:**

**Additional context**
Add any other context about the problem here.
## Additional context
<!-- Add any other context about the pull request here. -->
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
labels:
- "PR: waiting for review"
- "PR: dependencies"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
labels:
- "PR: waiting for review"
- "PR: dependencies"
19 changes: 19 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
'PR: waiting for review':
- '*'
- '.babelrc'
- '.editorconfig'
- '.eslintignore'
- '.eslintrc.js'
- '.gitignore'
- '.prettierrc'
- '.whitesource'
- '.github/**/*'
- '.vscode/**/*'
- '_icons/**/*'
- '_scripts/**/*'
- 'src/**/*'
- 'static/**/*'

'PR: dependencies':
- 'yarn.lock'
- 'package.json'
92 changes: 91 additions & 1 deletion .github/workflows/autoLabelIssue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,95 @@ jobs:
- uses: Naturalclar/[email protected]
with:
body: "both"
parameters: '[ {"keywords": ["visual bug"], "labels": ["B: visual"]}, {"keywords": ["AUR", "Chocolatey", "PortableApps", "winget"], "labels": ["B: Unofficial Download"]}, {"keywords": ["keyboard control not working"], "labels": ["B: keyboard control"]}, {"keywords": ["text/string issue"], "labels": ["B: text/string"]}, {"keywords": ["content not loading"], "labels": ["B: content not loading"]}, {"keywords": ["accessibility issue"], "labels": ["B: accessibility"]}, {"keywords": ["usability issue"], "labels": ["B: usability"]}, {"keywords": ["causes crash"], "labels": ["B: crash"]}, {"keywords": ["feature stopped working"], "labels": ["B: feature stopped working"]}, {"keywords": ["inconsistent behavior"], "labels": ["B: inconsistent behavior"]}, {"keywords": ["data loss"], "labels": ["B: data loss"]}, {"keywords": ["race condition"], "labels": ["B: race condition"]}, {"keywords": ["API issue"], "labels": ["B: API issue"]}, {"keywords": ["only happens in developer mode"], "labels": ["B: developer mode"]}, {"keywords": ["improvement to existing feature"], "labels": ["E: improvement existing feature"]}, {"keywords": ["new optional setting"], "labels": ["E: new optional setting"]}, {"keywords": ["visual improvement"], "labels": ["E: visual improvement"]}, {"keywords": ["display more information to user"], "labels": ["E: display more information"]}, {"keywords": ["ease of use improvement"], "labels": ["E: ease of use improvement"]}, {"keywords": ["support for external software"], "labels": ["E: support external software"]}, {"keywords": ["new feature"], "labels": ["E: new feature"]}, {"keywords": ["new keyboard shortcut"], "labels": ["E: keyboard shortcut"]}]'
parameters: >-
[
{
"keywords": ["visual bug"],
"labels": ["B: visual"]
},
{
"keywords": ["AUR", "Chocolatey", "PortableApps", "winget", "Scoop", "MPR"],
"labels": ["B: Unofficial Download"]
},
{
"keywords": ["keyboard control not working"],
"labels": ["B: keyboard control"]
},
{
"keywords": ["text/string issue"],
"labels": ["B: text/string"]
},
{
"keywords": ["content not loading"],
"labels": ["B: content not loading"]
},
{
"keywords": ["accessibility issue"],
"labels": ["B: accessibility"]
},
{
"keywords": ["usability issue"],
"labels": ["B: usability"]
},
{
"keywords": ["causes crash"],
"labels": ["B: crash"]
},
{
"keywords": ["feature stopped working"],
"labels": ["B: feature stopped working"]
},
{
"keywords": ["inconsistent behavior"],
"labels": ["B: inconsistent behavior"]
},
{
"keywords": ["data loss"],
"labels": ["B: data loss"]
},
{
"keywords": ["race condition"],
"labels": ["B: race condition"]
},
{
"keywords": ["API issue"],
"labels": ["B: API issue"]
},
{
"keywords": ["only happens in developer mode"],
"labels": ["B: developer mode"]
},
{
"keywords": ["improvement to existing feature"],
"labels": ["E: improvement existing feature"]
},
{
"keywords": ["new optional setting"],
"labels": ["E: new optional setting"]
},
{
"keywords": ["visual improvement"],
"labels": ["E: visual improvement"]
},
{
"keywords": ["display more information to user"],
"labels": ["E: display more information"]
},
{
"keywords": ["ease of use improvement"],
"labels": ["E: ease of use improvement"]
},
{
"keywords": ["support for external software"],
"labels": ["E: support external software"]
},
{
"keywords": ["new feature"],
"labels": ["E: new feature"]
},
{
"keywords": ["new keyboard shortcut"],
"labels": ["E: keyboard shortcut"]
}
]
github-token: "${{ secrets.GITHUB_TOKEN }}"
Loading

0 comments on commit 4fc5b47

Please sign in to comment.