Skip to content

Commit

Permalink
Merge pull request #1121 from totaldebug/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
marksie1988 authored Sep 4, 2023
2 parents 8d23050 + 31d5568 commit bc18492
Show file tree
Hide file tree
Showing 8 changed files with 768 additions and 1,411 deletions.
8 changes: 4 additions & 4 deletions docs/contribute/bugs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Reporting Bugs

This section guides you through submitting a bug report for Atomic Calendar Revive.
Following these guidelines helps maintainers and the community understand your report
:pencil:, reproduce the behavior :computer: :computer:, and find related reports
:pencil:, reproduce the behaviour :computer: :computer:, and find related reports
:mag_right:.

Before creating bug reports, please check the below information as you might find out
Expand Down Expand Up @@ -41,9 +41,9 @@ Explain the problem and include additional details to help maintainers reproduce

- **Use a clear and descriptive title** for the issue to identify the problem.
- **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining how you installed the plugin. When listing steps, **don't just say what you did, but explain how you did it**. For example, did you use the Lovelace Editor or do the change in YAML directly.
- **Provide specific examples to demonstrate the steps**. Include screenshots, or copy/pasteable configuration snippets, which you use in those examples. If you're providing snippets in the issue, use `Markdown code blocks <https://help.github.com/articles/markdown-basics/#multiple-lines>`_.
- **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
- **Explain which behavior you expected to see instead and why.**
- **Provide specific examples to demonstrate the steps**. Include screenshots, or copy/paste configuration snippets, which you use in those examples. If you're providing snippets in the issue, use `Markdown code blocks <https://help.github.com/articles/markdown-basics/#multiple-lines>`_.
- **Describe the behaviour you observed after following the steps** and point out what exactly is the problem with that behaviour.
- **Explain which behaviour you expected to see instead and why.**
- **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem.
- **If Chrome's developer tools pane is showing errors**, include these in your report
- **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
Expand Down
6 changes: 3 additions & 3 deletions docs/contribute/devcycle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Testing

There are no automated tests for this project, however it is expected that any
development work is tested against a HA Server with both CalDav and Google Calendar
attached, this ensures no advers impact is added with the feature or bugfix.
attached, this ensures no adverse impact is added with the feature or bugfix.

**********
Versioning
Expand All @@ -90,7 +90,7 @@ This project follows `Semantic Versioning <http://semver.org>`_

In the context of semantic versioning, the following should apply:

* **Major** - A breaking change that requires user invervention, or a change to a
* **Major** - A breaking change that requires user intervention, or a change to a
default value.
* **Minor** - A change that does not require intervention, or adds additional
functionality in a backwards compatible manner.
Expand All @@ -113,7 +113,7 @@ Once you are happy with the changes, these can be committed:
.. note::

Commit messages should follow `conventional commits <https://www.conventionalcommits.org/en/v1.0.0/>`_
this ensures clear commit messages within the repository.
this ensures clear commit messages within the repository. Without this your change will be rejected as it is required for release.


*******************
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.22.10",
"@babel/plugin-transform-template-literals": "^7.22.5",
"@babel/preset-env": "^7.22.10",
"@babel/preset-env": "^7.22.14",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-eslint": "^9.0.4",
Expand All @@ -38,16 +38,16 @@
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@typescript-eslint/parser": "^6.4.1",
"@typescript-eslint/eslint-plugin": "^6.5.0",
"@typescript-eslint/parser": "^6.5.0",
"babel-preset-minify": "^0.5.2",
"commitizen": "^4.3.0",
"conventional-changelog-conventionalcommits": "^6.1.0",
"conventional-changelog-conventionalcommits": "^7.0.1",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"prettier": "^3.0.2",
"prettier": "^3.0.3",
"rollup": "^3.28.1",
"rollup-plugin-serve": "^2.0.2",
"rollup-plugin-typescript2": "^0.35.0",
Expand All @@ -72,7 +72,7 @@
"dayjs": "^1.11.9",
"lit": "^2.8.0",
"lit-element": "^3.3.3",
"npm": "^9.8.1",
"npm": "^10.0.0",
"typescript": "^5.2.2"
},
"resolutions": {
Expand Down
Loading

0 comments on commit bc18492

Please sign in to comment.