forked from teslamate-org/teslamate
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into charging-curve
* master: Update timeline.json (teslamate-org#2601) Update charging-stats.json (teslamate-org#2566) Update to projects page (doc/website) (teslamate-org#2518) Update States top row panels height (teslamate-org#2487) Do no start EPMD Bump grafana/grafana from 8.4.1 to 8.4.5 in /grafana Bump docker/build-push-action from 2.9.0 to 2.10.0 Bump erlef/setup-beam from 1.10 to 1.11 Bump docker/login-action from 1.12.0 to 1.14.1 Bump actions/cache from 2.1.7 to 3.0.1 Bump website deps Bump deps Bump actions/checkout from 2.4.0 to 3 Restart stream process if token expired Update charging-stats.json (teslamate-org#2481) Fix typo Update POT files Update CHANGELOG Move encryption key warning into .container Encrypt API tokens (teslamate-org#2360) Update frontend deps DC charge curve scatter graph (teslamate-org#2093) Update CHANGELOG Bump Grafana to 8.4.1 Added panel with the cost of charges in SuC (teslamate-org#2448) Add datasource to table and map panels. (teslamate-org#2391) Update charging-stats.json (teslamate-org#2461) moved subselects to "from" clause (teslamate-org#2464) Added ProxyPreserveHost On to the Grafana entries in Apache2 config (teslamate-org#2471) Render Trip piechart legend (teslamate-org#2473) Bump follow-redirects from 1.14.7 to 1.14.8 in /website Update default.po (teslamate-org#2479)
- Loading branch information
Showing
63 changed files
with
5,973 additions
and
4,455 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ jobs: | |
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v2.4.0 | ||
uses: actions/checkout@v3 | ||
- name: Docker meta | ||
id: docker_meta | ||
uses: docker/[email protected] | ||
|
@@ -39,12 +39,12 @@ jobs: | |
- name: Set up Docker Buildx | ||
uses: docker/[email protected] | ||
- name: Login to DockerHub | ||
uses: docker/login-action@v1.12.0 | ||
uses: docker/login-action@v1.14.1 | ||
with: | ||
username: teslamate | ||
password: ${{ secrets.DOCKER_PASSWORD }} | ||
- name: Build and push | ||
uses: docker/build-push-action@v2.9.0 | ||
uses: docker/build-push-action@v2.10.0 | ||
with: | ||
context: . | ||
push: ${{ github.event_name != 'pull_request' }} | ||
|
@@ -57,7 +57,7 @@ jobs: | |
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v2.4.0 | ||
uses: actions/checkout@v3 | ||
- name: Docker meta | ||
id: docker_meta | ||
uses: docker/[email protected] | ||
|
@@ -72,12 +72,12 @@ jobs: | |
- name: Set up Docker Buildx | ||
uses: docker/[email protected] | ||
- name: Login to DockerHub | ||
uses: docker/login-action@v1.12.0 | ||
uses: docker/login-action@v1.14.1 | ||
with: | ||
username: teslamate | ||
password: ${{ secrets.DOCKER_PASSWORD }} | ||
- name: Build and push | ||
uses: docker/build-push-action@v2.9.0 | ||
uses: docker/build-push-action@v2.10.0 | ||
with: | ||
context: grafana | ||
push: ${{ github.event_name != 'pull_request' }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -194,6 +194,12 @@ nav.navbar { | |
} | ||
} | ||
|
||
.notification { | ||
.mdi { | ||
font-size: 1em; | ||
} | ||
} | ||
|
||
.mdi { | ||
font-size: 1.25em; | ||
} | ||
|
Oops, something went wrong.