diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json index 65d3f51ceb..6367533b95 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/app-conf.json @@ -1,5 +1,5 @@ { - "appName": "WSO2 IoT Server", + "appName": "Entgra IoT Server", "cachingEnabled": false, "debuggingEnabled": false, "permissionRoot": "/", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json index 406dde9f3a..3b4f031c6d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json @@ -57,11 +57,11 @@ }, "generalConfig": { "host": "https://%iot.manager.host%:%iot.manager.https.port%", - "companyName": "WSO2 Carbon Device Manager", - "browserTitle": "WSO2 Device Manager", + "companyName": "Entgra Carbon Device Manager", + "browserTitle": "Entgra Device Manager", "copyrightPrefix": "\u00A9 %date-year%, ", - "copyrightOwner": "WSO2 Inc.", - "copyrightOwnersSite": "http://www.wso2.org", + "copyrightOwner": "Entgra", + "copyrightOwnersSite": "https://www.entgra.io/", "copyrightSuffix": " All Rights Reserved." }, "scopes": [ diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs index abaf293f3c..67f867622b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs @@ -25,15 +25,15 @@

COOKIE POLICY

-

About WSO2 IoT Server

-

WSO2 IoT Server 3.3.0 is a complete solution that enables device manufacturers and enterprises to +

About Entgra IoT Server

+

Entgra IoT Server 3.4.0 is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner.

It also offers a complete and secure Enterprise Mobility Management (EMM/MDM) solution that aims to address mobile computing challenges faced by enterprises today. Supporting iOS, Android, and Windows devices, it helps organizations deal with both Corporate Owned, Personally Enabled (COPE) and employee-owned devices with the Bring Your Own Device (BYOD) concept.

-

WSO2 IoT Server 3.3.0 comes with advanced analytics, enabling users to analyze speed, proximity, and +

Entgra IoT Server 3.4.0 comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state.

Cookie Policy

@@ -45,67 +45,67 @@ apps remember things about you. Other technologies, including Web storage and identifiers associated with your device, may be used for similar purposes. In this policy, we use the term “cookies” to discuss all of these technologies.

-

How does WSO2 IoT Server 3.3.0 process cookies?

-

WSO2 IoT Server 3.3.0 uses cookies to store and retrieve information on your browser. This +

How does Entgra IoT Server 3.4.0 process cookies?

+

Entgra IoT Server 3.4.0 uses cookies to store and retrieve information on your browser. This information is used to provide a better user experience. Some cookies serve the purpose of allowing a user to log in to the system, maintain sessions, and keep track of activities within the login session.

-

Some cookies in WSO2 IoT Server 3.3.0 are used to personally identify you. However, the cookie +

Some cookies in Entgra IoT Server 3.4.0 are used to personally identify you. However, the cookie lifetime ends once your session ends, i.e., after you log-out, or after the session expiry time has elapsed.

Some cookies are simply used to give you a more personalised web experience, and these cannot be used to identify you or your activities personally.

This Cookie Policy is part of the IoT Server Privacy Policy.

-

What does WSO2 IoT Server 3.0.0 use cookies for?

-

Cookies are used for two purposes in WSO2 IoT Server 3.3.0.

+

What does Entgra IoT Server 3.0.0 use cookies for?

+

Cookies are used for two purposes in Entgra IoT Server 3.4.0.

  1. To identify you and provide security
  2. To provide a satisfying user experience.

Preferences

-

WSO2 IoT Server 3.3.0 uses cookies to remember your settings and preferences and to auto-fill the +

Entgra IoT Server 3.4.0 uses cookies to remember your settings and preferences and to auto-fill the fields to make your interactions with the site easier.

These cookies can not be used to personally identify you.

Security

    -
  1. WSO2 IoT Server 3.3.0 uses selected cookies to identify and prevent security risks. For example, - WSO2 IoT Server 3.3.0 may use cookies to store your session information to prevent others from +
  2. Entgra IoT Server 3.4.0 uses selected cookies to identify and prevent security risks. For example, + Entgra IoT Server 3.4.0 may use cookies to store your session information to prevent others from changing your password without your username and password.
  3. -
  4. WSO2 IoT Server 3.3.0 uses session cookie to maintain your active session.
  5. -
  6. WSO2 IoT Server 3.3.0 may use a temporary cookie when performing multi-factor authentication and +
  7. Entgra IoT Server 3.4.0 uses session cookie to maintain your active session.
  8. +
  9. Entgra IoT Server 3.4.0 may use a temporary cookie when performing multi-factor authentication and federated authentication.
  10. -
  11. WSO2 IoT Server 3.3.0 may use permanent cookies to detect the devices you have logged in +
  12. Entgra IoT Server 3.4.0 may use permanent cookies to detect the devices you have logged in previously. This is to to calculate the risk level associated with your current login attempt. Using these cookies protects you and your account from possible attacks.

Performance

-

WSO2 IoT Server 3.3.0 may use cookies to allow Remember Me functionalities.

+

Entgra IoT Server 3.4.0 may use cookies to allow Remember Me functionalities.

Analytics

-

WSO2 IoT Server 3.3.0 as a product does not use cookies for analytical purposes.

+

Entgra IoT Server 3.4.0 as a product does not use cookies for analytical purposes.

Third party cookies

-

Using WSO2 IoT Server 3.3.0 may cause third-party cookie to be set in your browser. WSO2 IoT Server - 3.3.0 has no control over how any of them operate. The third-party cookies that maybe set +

Using Entgra IoT Server 3.4.0 may cause third-party cookie to be set in your browser. Entgra IoT Server + 3.4.0 has no control over how any of them operate. The third-party cookies that maybe set include:

    -
  1. Any social login sites. For example, third-party cookies may be set when WSO2 IoT Server 3.3.0 +
  2. Any social login sites. For example, third-party cookies may be set when Entgra IoT Server 3.4.0 is configured to use “social” or “federated” login, and you opt to login with your “Social Account”.
  3. Any third party federated login.
-

WSO2 strongly advises you to refer the respective cookie policies of such sites carefully as WSO2 has +

Entgra strongly advises you to refer the respective cookie policies of such sites carefully as Entgra has no knowledge or use on these cookies.

-

What type of cookies does WSO2 IoT Server 3.3.0 use?

-

WSO2 IoT Server 3.3.0 uses persistent cookies and session cookies. A persistent cookie helps WSO2 IS - 3.3.0 to recognize you as an existing user so that it is easier to return to WSO2 or interact with - WSO2 IS 3.3.0 without signing in again. After you sign in, a persistent cookie stays in your browser - and will be read by WSO2 IoT Server 3.3.0 when you return to WSO2 IoT Server 3.3.0.

+

What type of cookies does Entgra IoT Server 3.4.0 use?

+

Entgra IoT Server 3.4.0 uses persistent cookies and session cookies. A persistent cookie helps Entgra IS + 3.4.0 to recognize you as an existing user so that it is easier to return to Entgra or interact with + Entgra IS 3.4.0 without signing in again. After you sign in, a persistent cookie stays in your browser + and will be read by Entgra IoT Server 3.4.0 when you return to Entgra IoT Server 3.4.0.

A session cookie is a cookie that is erased when the user closes the Web browser. The session cookie is stored in temporarily and is not retained after the browser is closed. Session cookies do not collect information from the user’s computer.

@@ -114,9 +114,9 @@ for websites to set cookies, you may worsen your overall user experience since it will no longer be personalized to you. It may also stop you from saving customized settings like login information. Most likely, disabling cookies will make it unable for you to use authentication and authorization - functionalities offered by WSO2 IoT Server 3.3.0.

+ functionalities offered by Entgra IoT Server 3.4.0.

If you have any questions or concerns regarding the use of cookies, please contact the entity or - individuals (or their data protection officer, if applicable) running this WSO2 IoT Server 3.3.0 + individuals (or their data protection officer, if applicable) running this Entgra IoT Server 3.4.0 instance.

What are the cookies used?

@@ -150,17 +150,17 @@

Disclaimer

-

This cookie policy is only for illustrative purposes of the product WSO2 IoT Server 3.3.0. The +

This cookie policy is only for illustrative purposes of the product Entgra IoT Server 3.4.0. The content in the policy is technically correct at the time of the product shipment. The - entity,organization or individual that runs this WSO2 IoT Server 3.3.0 instance has full authority - and responsibility with regard to the effective Cookie Policy. WSO2, its employees, partners, and + entity,organization or individual that runs this Entgra IoT Server 3.4.0 instance has full authority + and responsibility with regard to the effective Cookie Policy. Entgra, its employees, partners, and affiliates do not have access to and do not require, store, process or control any of the data, - including personal data contained in WSO2 IoT Server 3.3.0. All data, including personal data is - controlled and processed by the entity, organization or individual running WSO2 IoT Server 3.3.0. - WSO2, its employees partners and affiliates are not a data processor or a data controller within the - meaning of any data privacy regulations. WSO2 does not provide any warranties or undertake any + including personal data contained in Entgra IoT Server 3.4.0. All data, including personal data is + controlled and processed by the entity, organization or individual running Entgra IoT Server 3.4.0. + Entgra, its employees partners and affiliates are not a data processor or a data controller within the + meaning of any data privacy regulations. Entgra does not provide any warranties or undertake any responsibility or liability in connection with the lawfulness or the manner and purposes for which - WSO2 IoT Server 3.3.0 is used by such entities, organizations or persons.

+ Entgra IoT Server 3.4.0 is used by such entities, organizations or persons.

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs index bb65e7be65..b2f67283ee 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs @@ -25,29 +25,29 @@

PRIVACY POLICY

-

About WSO2 IoT Server

-

WSO2 IoT Server is a complete solution that enables device manufacturers and enterprises to connect +

About Entgra IoT Server

+

Entgra IoT Server is a complete solution that enables device manufacturers and enterprises to connect and manage their devices, build apps, manage events, secure devices and data, and visualize sensor data in a scalable manner.

It also offers a complete and secure Enterprise Mobility Management (EMM/MDM) solution that aims to address mobile computing challenges faced by enterprises today. Supporting iOS, Android, and Windows devices, it helps organizations deal with both Corporate Owned, Personally Enabled (COPE) and employee-owned devices with the Bring Your Own Device (BYOD) concept.

-

WSO2 IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and +

Entgra IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and geo-fencing information of devices including details of those in motion and stationary state.

Privacy Policy

-

This policy describes how WSO2 IoT Server 3.3.0 captures your personal information, the purposes of +

This policy describes how Entgra IoT Server 3.4.0 captures your personal information, the purposes of collection, and information about the retention of your personal information.

Please note that this policy is for reference only, and is applicable for the software as a product. - WSO2 Inc. and its developers have no access to the information held within WSO2 IoT Server - 3.3.0.Please see the Disclaimer section for more information. Entities, organisations or individuals - controlling the use and administration of WSO2 IoT Server 3.3.0 should create their own privacy + Entgra and its developers have no access to the information held within Entgra IoT Server + 3.4.0.Please see the Disclaimer section for more information. Entities, organisations or individuals + controlling the use and administration of Entgra IoT Server 3.4.0 should create their own privacy policies setting out the manner in which data is controlled or processed by the respective entity, organisation or individual.

What is personal information?

-

WSO2 IoT Server 3.3.0 considers anything related to you and by which you may be identified as your +

Entgra IoT Server 3.4.0 considers anything related to you and by which you may be identified as your personal information.

-

Signing in to WSO2 IoT Server 3.3.0

+

Signing in to Entgra IoT Server 3.4.0

  1. Your user name (except in cases where the user name created by your employer is under contract) @@ -55,7 +55,7 @@
  2. IP address used to log in
  3. Email address
-

Enrolling a device with WSO2 IoT Server 3.3.0

+

Enrolling a device with Entgra IoT Server 3.4.0

-

However, WSO2 IoT Server 3.3.0 also collects the following information that is not considered +

However, Entgra IoT Server 3.4.0 also collects the following information that is not considered personal information, but is used only for statistical purposes. The reason for this is that this information can not be used to track you.

Collection of personal information

-

WSO2 IoT Server 3.3.0 collects your information only to serve your access requirements. For example: +

Entgra IoT Server 3.4.0 collects your information only to serve your access requirements. For example:

Tracking Technologies

-

WSO2 IoT Server 3.3.0 collects your information by:

+

Entgra IoT Server 3.4.0 collects your information by:

Use of personal information

-

WSO2 IoT Server 3.3.0 will only use your personal information for the purposes for which it was +

Entgra IoT Server 3.4.0 will only use your personal information for the purposes for which it was collected (or for a use identified as consistent with that purpose).

-

WSO2 IoT Server 3.3.0 uses your personal information only for the following purposes.

+

Entgra IoT Server 3.4.0 uses your personal information only for the following purposes.

Disclosure of personal information

-

WSO2 IoT Server 3.3.0 only discloses personal information to the relevant applications (also known as - “Service Providers”) that are registered with WSO2 IoT Server 3.3.0. These applications are +

Entgra IoT Server 3.4.0 only discloses personal information to the relevant applications (also known as + “Service Providers”) that are registered with Entgra IoT Server 3.4.0. These applications are registered by the identity administrator of your entity or organization. Personal information is disclosed only for the purposes for which it was collected (or for a use identified as consistent with that purpose) as controlled by such Service Providers, unless you have consented otherwise or where it is required by law.

Legal process

-

Please note that the organisation, entity or individual running WSO2 IoT Server 3.3.0 may be +

Please note that the organisation, entity or individual running Entgra IoT Server 3.4.0 may be compelled to disclose your personal information with or without your consent when it is required by law following due and lawful process.

Storage of personal information

Where your personal information is stored

-

WSO2 IoT Server 3.3.0 stores your personal information in secured databases. WSO2 IoT Server 3.3.0 +

Entgra IoT Server 3.4.0 stores your personal information in secured databases. Entgra IoT Server 3.4.0 exercises proper industry accepted security measures to protect the database where your personal - information is held.WSO2 IoT Server 3.3.0 as a product does not transfer or share your data with any + information is held.Entgra IoT Server 3.4.0 as a product does not transfer or share your data with any third parties or locations.

-

WSO2 IoT Server 3.3.0 may use encryption to keep your personal data with an added level of +

Entgra IoT Server 3.4.0 may use encryption to keep your personal data with an added level of security.

How long your personal information is retained

-

WSO2 IoT Server 3.3.0 retains your personal data as long as you are an active user of our system. You +

Entgra IoT Server 3.4.0 retains your personal data as long as you are an active user of our system. You can update your personal data at any time using the given self-care user portals.

-

WSO2 IoT Server 3.3.0 may keep hashed secrets to provide you with an added level of security. This +

Entgra IoT Server 3.4.0 may keep hashed secrets to provide you with an added level of security. This includes:

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs index bcfa99eb09..98ee528e40 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs @@ -7,7 +7,7 @@

Register

-

Create a new account in WSO2 IoT Server(All fields are required.)

+

Create a new account in Entgra IoT Server(All fields are required.)