Skip to content

Commit 8a6f9ec

Browse files
authored
Merge branch 'develop' into feature/#3253-user-agent-configuration
2 parents 49c8353 + 83d15aa commit 8a6f9ec

335 files changed

Lines changed: 17729 additions & 8271 deletions

File tree

Some content is hidden

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

.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.eslintrc.json

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

.github/CODE_OF_CONDUCT.md

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual
10+
identity and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
- Demonstrating empathy and kindness toward other people
21+
- Being respectful of differing opinions, viewpoints, and experiences
22+
- Giving and gracefully accepting constructive feedback
23+
- Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
- Focusing on what is best not just for us as individuals, but for the overall
26+
community
27+
28+
Examples of unacceptable behavior include:
29+
30+
- The use of sexualized language or imagery, and sexual attention or advances of
31+
any kind
32+
- Trolling, insulting or derogatory comments, and personal or political attacks
33+
- Public or private harassment
34+
- Publishing others' private information, such as a physical or email address,
35+
without their explicit permission
36+
- Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official email address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement:
63+
Contact [Rejas](https://forum.magicmirror.builders/user/rejas),
64+
[Karsten](https://forum.magicmirror.builders/user/karsten13),
65+
[Sam](https://forum.magicmirror.builders/user/sdetweil) or
66+
[Kristjan](https://forum.magicmirror.builders/user/kristjanesperanto)
67+
via private message in the forum.
68+
69+
All complaints will be reviewed and investigated promptly and fairly.
70+
71+
All community leaders are obligated to respect the privacy and security of the
72+
reporter of any incident.
73+
74+
## Enforcement Guidelines
75+
76+
Community leaders will follow these Community Impact Guidelines in determining
77+
the consequences for any action they deem in violation of this Code of Conduct:
78+
79+
### 1. Correction
80+
81+
**Community Impact**: Use of inappropriate language or other behavior deemed
82+
unprofessional or unwelcome in the community.
83+
84+
**Consequence**: A private, written warning from community leaders, providing
85+
clarity around the nature of the violation and an explanation of why the
86+
behavior was inappropriate. A public apology may be requested.
87+
88+
### 2. Warning
89+
90+
**Community Impact**: A violation through a single incident or series of
91+
actions.
92+
93+
**Consequence**: A warning with consequences for continued behavior. No
94+
interaction with the people involved, including unsolicited interaction with
95+
those enforcing the Code of Conduct, for a specified period of time. This
96+
includes avoiding interactions in community spaces as well as external channels
97+
like social media. Violating these terms may lead to a temporary or permanent
98+
ban.
99+
100+
### 3. Temporary Ban
101+
102+
**Community Impact**: A serious violation of community standards, including
103+
sustained inappropriate behavior.
104+
105+
**Consequence**: A temporary ban from any sort of interaction or public
106+
communication with the community for a specified period of time. No public or
107+
private interaction with the people involved, including unsolicited interaction
108+
with those enforcing the Code of Conduct, is allowed during this period.
109+
Violating these terms may lead to a permanent ban.
110+
111+
### 4. Permanent Ban
112+
113+
**Community Impact**: Demonstrating a pattern of violation of community
114+
standards, including sustained inappropriate behavior, harassment of an
115+
individual, or aggression toward or disparagement of classes of individuals.
116+
117+
**Consequence**: A permanent ban from any sort of public interaction within the
118+
community.
119+
120+
## Attribution
121+
122+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
123+
version 2.1, available at
124+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
125+
126+
Community Impact Guidelines were inspired by
127+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
128+
129+
For answers to common questions about this code of conduct, see the FAQ at
130+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
131+
[https://www.contributor-covenant.org/translations][translations].
132+
133+
[homepage]: https://www.contributor-covenant.org
134+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
135+
[Mozilla CoC]: https://github.com/mozilla/diversity
136+
[FAQ]: https://www.contributor-covenant.org/faq
137+
[translations]: https://www.contributor-covenant.org/translations

.github/CONTRIBUTING.md

Lines changed: 15 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,55 +6,33 @@ We hold our code to standard, and these standards are documented below.
66

77
## Linters
88

9-
We use prettier for automatic linting of all our files: `npm run lint:prettier`.
9+
We use [prettier](https://prettier.io/) for automatic formatting a lot all our files. The configuration is in our `prettier.config.mjs` file.
1010

11-
### JavaScript: Run ESLint
11+
To run prettier, use `node --run lint:prettier`.
1212

13-
We use [ESLint](https://eslint.org) on our JavaScript files.
13+
### JavaScript: Run ESLint
1414

15-
Our ESLint configuration is in our `.eslintrc.json` and `.eslintignore` files.
15+
We use [ESLint](https://eslint.org) to lint our JavaScript files. The configuration is in our `eslint.config.mjs` file.
1616

17-
To run ESLint, use `npm run lint:js`.
17+
To run ESLint, use `node --run lint:js`.
1818

1919
### CSS: Run StyleLint
2020

21-
We use [StyleLint](https://stylelint.io) to lint our CSS. Our configuration is in our `.stylelintrc` file.
22-
23-
To run StyleLint, use `npm run lint:css`.
24-
25-
## Testing
26-
27-
We use [Jest](https://jestjs.io) for JavaScript testing.
28-
29-
To run all tests, use `npm run test`.
30-
31-
The specific test commands are defined in `package.json`.
32-
So you can also run the specific tests with other commands, e.g. `npm run test:unit` or `npx jest tests/e2e/env_spec.js`.
21+
We use [StyleLint](https://stylelint.io) to lint our CSS. The configuration is in our `stylelint.config.mjs` file.
3322

34-
## Submitting Issues
23+
To run StyleLint, use `node --run lint:css`.
3524

36-
Please only submit reproducible issues.
25+
### Markdown: Run markdownlint
3726

38-
If you're not sure if it's a real bug or if it's just you, please open a topic on the forum: [https://forum.magicmirror.builders/category/15/bug-hunt](https://forum.magicmirror.builders/category/15/bug-hunt)
27+
We use [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) to lint our markdown files. The configuration is in our `.markdownlint.json` file.
3928

40-
Problems installing or configuring your MagicMirror? Check out: [https://forum.magicmirror.builders/category/10/troubleshooting](https://forum.magicmirror.builders/category/10/troubleshooting)
29+
To run markdownlint, use `node --run lint:markdown`.
4130

42-
When submitting a new issue, please supply the following information:
43-
44-
**Platform**: Place your platform here... give us your web browser/Electron version _and_ your hardware (Raspberry Pi 2/3/4, Windows, Mac, Linux, System V UNIX).
45-
46-
**Node Version**: Make sure it's version 18 or later (recommended is 20).
47-
48-
**MagicMirror² Version**: Please let us know which version of MagicMirror² you are running. It can be found in the `package.json` file.
49-
50-
**Description**: Provide a detailed description about the issue and include specific details to help us understand the problem. Adding screenshots will help describing the problem.
51-
52-
**Steps to Reproduce**: List the step by step process to reproduce the issue.
53-
54-
**Expected Results**: Describe what you expected to see.
31+
## Testing
5532

56-
**Actual Results**: Describe what you actually saw.
33+
We use [Jest](https://jestjs.io) for JavaScript testing.
5734

58-
**Configuration**: What does the used config.js file look like? Don't forget to remove any sensitive information!
35+
To run all tests, use `node --run test`.
5936

60-
**Additional Notes**: Provide any other relevant notes not previously mentioned. This is optional.
37+
The specific test commands are defined in `package.json`.
38+
So you can also run the specific tests with other commands, e.g. `node --run test:unit` or `npx jest tests/e2e/env_spec.js`.

.github/ISSUE_TEMPLATE.md

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

0 commit comments

Comments
 (0)