ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update company name

pull/240/head
Michael Zanetti 2019-12-27 00:29:58 +01:00
parent 6cdcd47f9b
commit 9c7694c133
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/debug-interface/warning.svg
View File

@ -56,7 +56,7 @@
</dc:creator>
<dc:publisher>
<cc:Agent>
<dc:title>guh GmbH</dc:title>
<dc:title>nymea GmbH</dc:title>
</cc:Agent>
</dc:publisher>
<dc:description>Warning icon for the debug interface</dc:description>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

2
doc/config.qdocconf
View File

@ -5,7 +5,7 @@ description = Developer documentation!
dita.metadata.default.author = Simon Stürz
dita.metadata.default.permissions = all
dita.metadata.default.publisher = guh GmbH
dita.metadata.default.publisher = nymea GmbH
dita.metadata.default.copyryear = 2019
dita.metadata.default.copyrholder = Simon Stürz
dita.metadata.default.audience = programmer

2
doc/html-template.qdocconf
View File

@ -47,7 +47,7 @@ HTML.footer = \
"</div>\n" \
"<div class=\"footer\">\n" \
" <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2013-2019 guh GmbH. All rights reserved. <a href=\"license.html\">License</a>"\n \
" <acronym title=\"Copyright\">&copy;</acronym> 2013-2019 nymea GmbH. All rights reserved. <a href=\"license.html\">License</a>"\n \
" </p>\n" \
"</div>\n"

2
libnymea-core/certificategenerator.cpp
View File

@ -67,7 +67,7 @@ void CertificateGenerator::generate(const QString &certificateFilename, const QS
X509_NAME_add_entry_by_txt(name, "E", MBSTRING_ASC, (unsigned char *)"nymea", -1, -1, 0);
X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (unsigned char *)"nymea.io", -1, -1, 0);
X509_NAME_add_entry_by_txt(name, "OU", MBSTRING_ASC, (unsigned char *)"home", -1, -1, 0);
X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, (unsigned char *)"guh GmbH", -1, -1, 0);
X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, (unsigned char *)"nymea GmbH", -1, -1, 0);
X509_NAME_add_entry_by_txt(name, "L", MBSTRING_ASC, (unsigned char *)"Vienna", -1, -1, 0);
X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, (unsigned char *)"AT", -1, -1, 0);
X509_set_issuer_name(x509, name);

4
libnymea-core/debugserverhandler.cpp
View File

@ -1840,7 +1840,7 @@ QByteArray DebugServerHandler::createDebugXmlDocument()
// Footer
writer.writeStartElement("div");
writer.writeAttribute("class", "footer");
writer.writeTextElement("p", QString("Copyright %1 %2 guh GmbH.").arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING));
writer.writeTextElement("p", QString("Copyright %1 %2 nymea GmbH.").arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING));
//: The footer license note of the debug interface
writer.writeTextElement("p", tr("Released under the GNU GENERAL PUBLIC LICENSE Version 2."));
writer.writeEndElement(); // div footer
@ -1915,7 +1915,7 @@ QByteArray DebugServerHandler::createErrorXmlDocument(HttpReply::HttpStatusCode
// Footer
writer.writeStartElement("div");
writer.writeAttribute("class", "footer");
writer.writeTextElement("p", QString("Copyright %1 %2 guh GmbH.").arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING));
writer.writeTextElement("p", QString("Copyright %1 %2 nymea GmbH.").arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING));
writer.writeTextElement("p", tr("Released under the GNU GENERAL PUBLIC LICENSE Version 2."));
writer.writeEndElement(); // div footer

2
libnymea-core/servermanager.cpp
View File

@ -311,7 +311,7 @@ bool ServerManager::registerZeroConfService(const ServerConfiguration &configura
QHash<QString, QString> txt;
txt.insert("jsonrpcVersion", JSON_PROTOCOL_VERSION);
txt.insert("serverVersion", NYMEA_VERSION_STRING);
txt.insert("manufacturer", "guh GmbH");
txt.insert("manufacturer", "nymea GmbH");
txt.insert("uuid", NymeaCore::instance()->configuration()->serverUuid().toString());
txt.insert("name", NymeaCore::instance()->configuration()->serverName());
txt.insert("sslEnabled", configuration.sslEnabled ? "true" : "false");

4
libnymea-core/servers/webserver.cpp
View File

@ -616,8 +616,8 @@ QByteArray WebServer::createServerXmlDocument(QHostAddress address)
writer.writeTextElement("presentationURL", presentationUrl);
writer.writeTextElement("deviceType", "urn:schemas-upnp-org:device:Basic:1");
writer.writeTextElement("friendlyName", NymeaCore::instance()->configuration()->serverName());
writer.writeTextElement("manufacturer", "guh GmbH");
writer.writeTextElement("manufacturerURL", "http://guh.io");
writer.writeTextElement("manufacturer", "nymea GmbH");
writer.writeTextElement("manufacturerURL", "http://nymea.io");
writer.writeTextElement("modelDescription", "IoT server");
writer.writeTextElement("modelName", "nymead");
writer.writeTextElement("modelNumber", NYMEA_VERSION_STRING);

2
server/main.cpp
View File

@ -121,7 +121,7 @@ int main(int argc, char *argv[])
"device available in the system and create individual scenes and behaviors \n"
"for your environment.\n\n");
applicationDescription.append(QString("nymead %1 %2 %3 guh GmbH\n"
applicationDescription.append(QString("nymead %1 %2 %3 nymea GmbH\n"
"Released under the GNU GENERAL PUBLIC LICENSE Version 2.\n\n"
"API version: %4\n").arg(NYMEA_VERSION_STRING).arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING).arg(JSON_PROTOCOL_VERSION));