Skip to content

Commit 54cb8e9

Browse files
Merge pull request #1898 from KelvinTegelaar/dev
Dev to release
2 parents 0e46a5f + ad96209 commit 54cb8e9

File tree

250 files changed

+10738
-26807
lines changed

Some content is hidden

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

250 files changed

+10738
-26807
lines changed

.eslintrc.cjs

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
module.exports = {
2+
env: {
3+
browser: true,
4+
es6: true,
5+
node: true,
6+
},
7+
parserOptions: {
8+
ecmaVersion: 'latest',
9+
sourceType: 'module',
10+
ecmaFeatures: {
11+
jsx: true,
12+
},
13+
},
14+
settings: {
15+
react: {
16+
version: 'detect',
17+
},
18+
'import/resolver': {
19+
// added for `import {component} from 'src/component' style imports`
20+
'eslint-import-resolver-custom-alias': {
21+
alias: {
22+
src: './src',
23+
},
24+
extensions: ['.js', '.jsx', '.json'],
25+
},
26+
},
27+
},
28+
extends: [
29+
'eslint:recommended',
30+
'plugin:import/recommended',
31+
'plugin:react/recommended',
32+
'plugin:react/jsx-runtime',
33+
'plugin:react-hooks/recommended',
34+
'plugin:prettier/recommended',
35+
],
36+
plugins: ['react-hooks', 'import'],
37+
rules: {
38+
'no-unused-vars': 'off',
39+
'react/prop-types': 'warn',
40+
// this rule is annoying on strings with quotes in them
41+
'react/no-unescaped-entities': 'off',
42+
},
43+
}

.eslintrc.json

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

.github/workflows/Check_for_Version_Update.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
name: Check for Version Update
3-
on: # yamllint disable-line rule:truthy
3+
on:
44
pull_request:
55
branches: [master, main]
66
workflow_dispatch:
77
jobs:
88
build:
9+
if: github.repository_owner == 'KelvinTegelaar'
910
name: 'Check for Version Update'
1011
runs-on: ubuntu-latest
1112
steps:

.github/workflows/Close_Stale_Issues_and_PRs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
22
name: 'Close stale issues and PRs'
3-
on: # yamllint disable-line rule:truthy
3+
on:
44
schedule:
55
- cron: '30 1 * * *'
66
jobs:
77
stale:
8+
if: github.repository_owner == 'KelvinTegelaar'
89
runs-on: ubuntu-latest
910
steps:
1011
- uses: actions/stale@v4

.github/workflows/CodeQL_Analyser.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
name: 'CodeQL'
3-
on: # yamllint disable-line rule:truthy
3+
on:
44
pull_request:
55
branches: [master, main, dev, react]
66
schedule:
77
- cron: '26 17 * * 0'
88
jobs:
99
analyze:
10+
if: github.repository_owner == 'KelvinTegelaar'
1011
name: Analyze
1112
runs-on: ubuntu-latest
1213
permissions:
Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
name: Add Comment
3-
on: # yamllint disable-line rule:truthy
3+
on:
44
issues:
55
types:
66
- labeled
77
jobs:
88
add-comment_bug:
9-
if: github.event.label.name == 'unconfirmed-by-user'
9+
if: github.repository_owner == 'KelvinTegelaar' && github.event.label.name == 'unconfirmed-by-user'
1010
runs-on: ubuntu-latest
1111
permissions:
1212
issues: write
@@ -17,23 +17,14 @@ jobs:
1717
issue-number: ${{ github.event.issue.number }}
1818
body: |
1919
Thank you for creating a bug. Please make sure your bug is indeed a unique case by checking current and past issues, and reading the complete documentation at https://docs.cipp.app/
20-
If your bug is a known documentation issue, it will be closed without notice by a contributor. To confirm that this is not a bug found in the documentation, please copy and paste the following comment: "I confirm that I have checked the documentation thoroughly and believe this to be an actual bug.".
20+
If your bug is a known documentation issue, it will be closed without notice by a contributor. To confirm that this is not a bug found in the documentation, please copy and paste the following comment: "I confirm that I have checked the documentation thoroughly and believe this to be an actual bug."
2121
2222
Without confirming, your report will be closed in 24 hours. If you'd like this bug to be assigned to you, please comment "I would like to work on this please!".
2323
add-comment_fr:
24-
if: github.event.label.name == 'enhancement'
24+
if: github.repository_owner == 'KelvinTegelaar' && github.event.label.name == 'enhancement'
2525
runs-on: ubuntu-latest
2626
permissions:
2727
issues: write
2828
steps:
2929
- name: Add Comment
30-
uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae
31-
with:
32-
issue-number: ${{ github.event.issue.number }}
33-
body: |
34-
Thank you for creating a feature request!
35-
Your current priority is set to "No Priority". No Priority Feature requests automatically get closed in two days if a contributor does not accept the FR.
36-
37-
If you are a sponsor you can request an upgrade of priority. To upgrade the priority type "I would like to upgrade the priority".
38-
If you want this feature to be integrated you can always do this yourself by checking out our contributions guide at https://docs.cipp.app/dev-documentation/contributing-to-the-code. Contributors to the CIPP project reserve the right to close feature requests at will.
39-
If you'd like this feature request to be assigned to you, please comment "I would like to work on this please!".
30+
uses: peter-evans/create-or-update

.github/workflows/Label_Issues.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
name: Label Issues
3-
on: # yamllint disable-line rule:truthy
3+
on:
44
issues:
55
types:
66
- opened
77
jobs:
88
label_issues_bugs:
9-
if: contains(github.event.issue.title,'Bug')
9+
if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Bug')
1010
runs-on: ubuntu-latest
1111
permissions:
1212
issues: write
@@ -17,7 +17,7 @@ jobs:
1717
add-labels: 'unconfirmed-by-user'
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
1919
label_issues_frs:
20-
if: contains(github.event.issue.title,'Feature')
20+
if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Feature')
2121
runs-on: ubuntu-latest
2222
permissions:
2323
issues: write

.github/workflows/Node_Project_Check.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: NodeJS Project Check
3-
on: # yamllint disable-line rule:truthy
3+
on:
44
pull_request:
55
branches:
66
- main
@@ -10,6 +10,7 @@ concurrency:
1010
cancel-in-progress: false
1111
jobs:
1212
install-build:
13+
if: github.repository_owner == 'KelvinTegelaar'
1314
name: NPM Install and Build
1415
runs-on: ubuntu-latest
1516
strategy:
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
name: Label Issues
3-
on: # yamllint disable-line rule:truthy
3+
on:
44
issues:
55
types:
66
- opened
77
jobs:
88
label_issues_bugs:
9-
if: contains(github.event.issue.title,'Bug')
9+
if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Bug')
1010
runs-on: ubuntu-latest
1111
permissions:
1212
issues: write
1313
steps:
1414
- name: Sponsor Labels
1515
uses: JasonEtco/[email protected]
1616
with:
17-
label: 'Sponsor Request'
17+
label: 'Sponsor Request'

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
18

0 commit comments

Comments
 (0)