Skip to content

Commit

Permalink
Merge branch 'master' into scene_device_feature
Browse files Browse the repository at this point in the history
  • Loading branch information
rpochet authored Sep 12, 2023
2 parents 9e88a52 + 8cf9f08 commit b3bd6f5
Show file tree
Hide file tree
Showing 71 changed files with 1,713 additions and 967 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ We use github to host code, to track issues and feature requests, as well as acc

## Before making a Pull Request

Make sure you discussed with the team on [Gladys Community](https://community.gladysassistant.com/) to ensure your pull request goes in the same direction as current developements 🙂
Make sure you discussed with the team on our Gladys [french forum](https://community.gladysassistant.com/) or [english forum](https://en-community.gladysassistant.com/) to ensure your pull request goes in the same direction as current developements 🙂

Then, create a GitHub Issue to indicate that you're working on the topic.

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ about: Report a bug to help us improve Gladys Assistant

First, are you sure that you found a Gladys bug?

If you are not sure, you can come discuss with us on [Gladys Community](http://community.gladysassistant.com/) 🙂
If you are not sure, you can come discuss with us on our community, in [french](http://community.gladysassistant.com/) or [english](https://en-community.gladysassistant.com/) 🙂

**Describe the bug**
A clear and concise description of what the bug is.
Expand Down
12 changes: 9 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
blank_issues_enabled: true
contact_links:
- name: Gladys Assistant Forum
- name: Gladys Assistant english forum
url: https://en-community.gladysassistant.com/
about: We use this forum for questions & support in english.
- name: Gladys Assistant french Forum
url: https://community.gladysassistant.com/
about: We use the forum for questions & support.
- name: Feature Requests
about: We use the forum for questions & support in french.
- name: Feature Requests (english)
url: https://en-community.gladysassistant.com/c/feature-requests/7/l/latest?order=votes
about: We use our forum as feature requests. You can create feature requests there, and vote for them.
- name: Feature Requests (french)
url: https://community.gladysassistant.com/c/international/feature-requests/53
about: We use our forum as feature requests. You can create feature requests there, and vote for them.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ To ensure your Pull Request can be accepted as fast as possible, make sure to re
- [ ] Is the linter passing? (`npm run eslint` on both front/server)
- [ ] Did you run prettier? (`npm run prettier` on both front/server)
- [ ] If you are adding a new features/services, did you run integration comparator? (`npm run compare-translations` on front)
- [ ] Did you test this pull request in real life? With real devices? If this development is a big feature or a new service, we recommend that you provide a Docker image to [the community](https://community.gladysassistant.com/) for testing before merging.
- [ ] Did you test this pull request in real life? With real devices? If this development is a big feature or a new service, we recommend that you provide a Docker image to the community ([french forum](https://community.gladysassistant.com/)/[english forum](https://en-community.gladysassistant.com/)) for testing before merging.
- [ ] If your changes modify the API (REST or Node.js), did you modify the API documentation? (Documentation is based on comments in code)
- [ ] If you are adding a new features/services which needs explanation, did you modify the user documentation? See [the GitHub repo](https://github.com/GladysAssistant/v4-website) and the [website](https://gladysassistant.com).
- [ ] Did you add fake requests data for the demo mode (`front/src/config/demo.js`) so that the demo website is working without a backend? (if needed) See [https://demo.gladysassistant.com](https://demo.gladysassistant.com).
Expand Down
2 changes: 1 addition & 1 deletion .github/SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

First, thanks for trying out Gladys!

The best place to ask for help is our [Gladys Community Forum](https://community.gladysassistant.com/).
The best place to ask for help is our forum, in [french](https://community.gladysassistant.com/) or [english](https://en-community.gladysassistant.com/).

Please **_do not_** raise an issue on GitHub if it's a support problem!

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/docker-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,6 @@ jobs:
cache-to: type=inline
- name: 🐳 Legacy Tags
run: |
echo '{"experimental": true}' | sudo tee -a /etc/docker/daemon.json
export DOCKER_CLI_EXPERIMENTAL=enabled
sudo systemctl restart docker
export DIGESTARM=$(docker manifest inspect ${{ env.DOCKERHUB_REPO }}:latest | jq -r '.manifests | to_entries[] | select(.value.platform.architecture == "arm" and .value.platform.variant == "v6").value | .digest')
docker pull ${{ env.DOCKERHUB_REPO }}@$DIGESTARM
docker tag ${{ env.DOCKERHUB_REPO }}@$DIGESTARM ${{ env.DOCKERHUB_REPO }}:v4-arm
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

## Reporting a Vulnerability

To report a vulnerability, you can contact us on [Gladys Assistant forum](https://community.gladysassistant.com/) in private, or on the contact form [on our website](https://gladysassistant.com/contact/).
To report a vulnerability, you can contact us on Gladys Assistant [french forum](https://community.gladysassistant.com/) or [english forum](https://en-community.gladysassistant.com/) in private, or on the contact form [on our website](https://gladysassistant.com/contact/).
132 changes: 84 additions & 48 deletions front/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"@gladysassistant/gladys-gateway-js": "^4.13.1",
"@gladysassistant/theme-optimized": "^1.0.3",
"@jaames/iro": "^5.5.2",
"@yaireo/tagify": "^4.5.0",
"apexcharts": "^3.29.0",
"@yaireo/tagify": "4.5.0",
"apexcharts": "^3.41.1",
"axios": "^0.21.1",
"classnames": "^2.3.1",
"cropperjs": "^1.5.12",
Expand All @@ -69,7 +69,7 @@
"preact-router": "^3.2.1",
"qrcode": "^1.4.2",
"react-big-calendar": "^1.6.9",
"react-clock": "^3.1.0",
"react-clock": "^4.5.0",
"react-datepicker": "^3.8.0",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
Expand Down
Loading

0 comments on commit b3bd6f5

Please sign in to comment.