From e3d60b7d92c2bf594b2237671c742ba67f6e15ad Mon Sep 17 00:00:00 2001 From: funghi999 <50140796+funghi999@users.noreply.github.com> Date: Wed, 3 Jul 2024 08:50:29 +0200 Subject: [PATCH] Change git hash (#3) * chore: Update FUNDING.yml with new ko-fi username (cherry picked from commit d8d27b63a9ed58edbc470d1e65ae7a5766a49591) * chore: Update PR template link to point to the correct repository (cherry picked from commit f8e3f34344cddd54d1939274c207f1d14225aff3) * feat: Add .vscode/extensions.json to .gitignore * chore: Update FUNDING.yml with new ko-fi username (cherry picked from commit d8d27b63a9ed58edbc470d1e65ae7a5766a49591) * chore: Update PR template link to point to the correct repository (cherry picked from commit f8e3f34344cddd54d1939274c207f1d14225aff3) * feat: Add .vscode/extensions.json to .gitignore --------- Co-authored-by: depilzma --- .github/FUNDING.yml | 2 +- .github/workflows/build.yml | 2 +- .gitignore | 1 + webapp/src/locales/de.json | 2 +- webapp/src/locales/en.json | 2 +- webapp/src/locales/fr.json | 2 +- webapp/src/views/SystemInfoView.vue | 6 +++++- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 28567886..6b67549c 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -ko_fi: tbnobody \ No newline at end of file +ko_fi: funghi999 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29a30d9e..48c2c480 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: OpenDTU Build +name: OpenDTU DUO-Fusion Build on: push: diff --git a/.gitignore b/.gitignore index c29e72f4..56a33d5f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ platformio-device-monitor*.log logs/device-monitor*.log platformio_override.ini .DS_Store +.vscode/extensions.json diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json index 93610890..ba347652 100644 --- a/webapp/src/locales/de.json +++ b/webapp/src/locales/de.json @@ -582,7 +582,7 @@ "ProjectOriginBody3": "Die Software wurde nach bestem Wissen und Gewissen entwickelt. Dennoch kann keine Haftung für eine Fehlfunktion oder einen Garantieverlust des Wechselrichters übernommen werden.", "ProjectOriginBody4": "OpenDTU ist frei verfügbar. Wenn Sie Geld für die Software bezahlt haben, wurden Sie wahrscheinlich abgezockt.", "NewsUpdates": "Neuigkeiten und Updates", - "NewsUpdatesBody": "Neue Updates sind auf Github zu finden: https://github.com/tbnobody/OpenDTU", + "NewsUpdatesBody": "Neue Updates sind auf Github zu finden: https://github.com/funghi999/OpenDTU-DUO-Fusion", "ErrorReporting": "Fehlerberichte", "ErrorReportingBody": "Bitte melden Sie Probleme über die Ticketverwaltung von Github.", "Discussion": "Diskussion", diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json index 34be62f4..326527b4 100644 --- a/webapp/src/locales/en.json +++ b/webapp/src/locales/en.json @@ -582,7 +582,7 @@ "ProjectOriginBody3": "The software was developed to the best of our knowledge and belief. Nevertheless, no liability can be accepted for a malfunction or guarantee loss of the inverter.", "ProjectOriginBody4": "OpenDTU is freely available. If you paid money for the software, you probably got ripped off.", "NewsUpdates": "News & Updates", - "NewsUpdatesBody": "New updates can be found on Github: https://github.com/tbnobody/OpenDTU", + "NewsUpdatesBody": "New updates can be found on Github: https://github.com/funghi999/OpenDTU-DUO-Fusion", "ErrorReporting": "Error Reporting", "ErrorReportingBody": "Please report issues using the feature provided by Github", "Discussion": "Discussion", diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json index d9d148da..2657ca5e 100644 --- a/webapp/src/locales/fr.json +++ b/webapp/src/locales/fr.json @@ -582,7 +582,7 @@ "ProjectOriginBody3": "Le logiciel a été développé au mieux de nos connaissances et de nos convictions. Néanmoins, aucune responsabilité ne peut être acceptée en cas de dysfonctionnement ou de perte de garantie de l'onduleur.", "ProjectOriginBody4": "OpenDTU est disponible gratuitement. Si vous avez payé pour le logiciel, vous avez probablement été arnaqué.", "NewsUpdates": "Actualités et mises à jour", - "NewsUpdatesBody": "Les nouvelles mises à jour peuvent être trouvées sur https://github.com/tbnobody/OpenDTU", + "NewsUpdatesBody": "Les nouvelles mises à jour peuvent être trouvées sur https://github.com/funghi999/OpenDTU-DUO-Fusion", "ErrorReporting": "Rapport d'erreurs", "ErrorReportingBody": "Veuillez signaler les problèmes en utilisant la fonction fournie par Github.", "Discussion": "Discussion", diff --git a/webapp/src/views/SystemInfoView.vue b/webapp/src/views/SystemInfoView.vue index 0c3f01a1..f491ff25 100644 --- a/webapp/src/views/SystemInfoView.vue +++ b/webapp/src/views/SystemInfoView.vue @@ -78,8 +78,12 @@ export default defineComponent({ return; } + if (!this.allowVersionInfo) { + return; + } + const fetchUrl = - 'https://api.github.com/repos/tbnobody/OpenDTU/compare/' + this.systemDataList.git_hash + '...HEAD'; + 'https://api.github.com/repos/funghi999/openDTU-DUO-Fusion/compare/' + this.systemDataList.git_hash + '...HEAD'; fetch(fetchUrl) .then((response) => {