ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #258: guh GmbH is now nymea GmbH

Browse Source
This commit is contained in:
Jenkins nymea 2019-10-28 12:23:23 +01:00
commit ab22902ab3
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-app-core/connection/awsclient.cpp
View File

@ -70,7 +70,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
config.certificateVendorId = "d399290a-0599-4895-b4c3-34d2bdb579f4"; config.certificateVendorId = "d399290a-0599-4895-b4c3-34d2bdb579f4";
config.mqttEndpoint = "a2d0ba9572wepp-ats.iot.eu-west-1.amazonaws.com"; config.mqttEndpoint = "a2d0ba9572wepp-ats.iot.eu-west-1.amazonaws.com";
config.region = "eu-west-1"; config.region = "eu-west-1";
config.apiEndpoint = "api-cloud.guh.io"; config.apiEndpoint = "api-cloud.nymea.io";
config.pushNotificationSystem = pushSystem; config.pushNotificationSystem = pushSystem;
m_configs.insert("Community", config); m_configs.insert("Community", config);
@ -83,7 +83,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
config.certificateVendorId = "testVendor001"; config.certificateVendorId = "testVendor001";
config.mqttEndpoint = "a2addxakg5juii-ats.iot.eu-west-1.amazonaws.com"; config.mqttEndpoint = "a2addxakg5juii-ats.iot.eu-west-1.amazonaws.com";
config.region = "eu-west-1"; config.region = "eu-west-1";
config.apiEndpoint = "testapi-cloud.guh.io"; config.apiEndpoint = "testapi-cloud.nymea.io";
config.pushNotificationSystem = pushSystem; config.pushNotificationSystem = pushSystem;
m_configs.insert("Testing", config); m_configs.insert("Testing", config);
@ -97,7 +97,7 @@ AWSClient::AWSClient(QObject *parent) : QObject(parent),
config.certificateVendorId = ""; config.certificateVendorId = "";
config.mqttEndpoint = "a27q7a2x15m8h3-ats.iot.eu-west-1.amazonaws.com"; config.mqttEndpoint = "a27q7a2x15m8h3-ats.iot.eu-west-1.amazonaws.com";
config.region = "eu-west-1"; config.region = "eu-west-1";
config.apiEndpoint = "api-cloud.guh.io"; config.apiEndpoint = "api-cloud.nymea.io";
config.pushNotificationSystem = pushSystem; config.pushNotificationSystem = pushSystem;
m_configs.insert("Marantec", config); m_configs.insert("Marantec", config);

2
nymea-app/ui/appsettings/AboutPage.qml
View File

@ -21,7 +21,7 @@ Page {
id: imprint id: imprint
width: parent.width width: parent.width
title: app.appName title: app.appName
githubLink: "https://github.com/guh/nymea-app" githubLink: "https://github.com/nymea/nymea-app"
NymeaListItemDelegate { NymeaListItemDelegate {
Layout.fillWidth: true Layout.fillWidth: true

4
nymea-app/ui/components/Imprint.qml
View File

@ -69,7 +69,7 @@ Item {
Layout.rightMargin: app.margins Layout.rightMargin: app.margins
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.bold: true font.bold: true
text: "Copyright (C) 2019 guh GmbH" text: "Copyright (C) 2019 nymea GmbH"
} }
Label { Label {
@ -77,7 +77,7 @@ Item {
Layout.leftMargin: app.margins Layout.leftMargin: app.margins
Layout.rightMargin: app.margins Layout.rightMargin: app.margins
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: qsTr("nymea is a registered trademark of guh GmbH.") text: qsTr("nymea is a registered trademark of nymea GmbH.")
} }
Label { Label {

2
nymea-app/ui/system/AboutNymeaPage.qml
View File

@ -20,7 +20,7 @@ Page {
id: imprint id: imprint
width: parent.width width: parent.width
title: qsTr("%1:core").arg(app.systemName) title: qsTr("%1:core").arg(app.systemName)
githubLink: "https://github.com/guh/nymea" githubLink: "https://github.com/nymea/nymea"
NymeaListItemDelegate { NymeaListItemDelegate {
Layout.fillWidth: true Layout.fillWidth: true