deenath
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Upgrade server version in UI text info

Closes product-iots#838

See merge request entgra/carbon-device-mgt!730
revert-70ac1926
Dharmakeerthi Lasantha 4 years ago
parent 7890517d43 4ea3890a2e
commit 76f49438a6
4 changed files with 70 additions and 65 deletions
Show Stats Download Patch File Download Diff File

61
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs
Unescape View File

@ -26,14 +26,15 @@
<div class="panel-body">
<h3>About Entgra IoT Server</h3>
<p>Entgra IoT Server 3.8.0 is a complete solution that enables device manufacturers and enterprises to
<p>Entgra IoT Server 4.1.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.</p>
<p>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.</p>
<p>Entgra IoT Server 3.8.0 comes with advanced analytics, enabling users to analyze speed, proximity, and
<p>Entgra IoT Server 4.1.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.</p>
</p>
<h2>Cookie Policy</h2>
@ -45,55 +46,58 @@
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.</p>
<h3>How does Entgra IoT Server 3.8.0 process cookies?</h3>
<p>Entgra IoT Server 3.8.0 uses cookies to store and retrieve information on your browser. This
<h3>How does Entgra IoT Server 4.1.0 process cookies?</h3>
<p>Entgra IoT Server 4.1.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.</p>
<p>Some cookies in Entgra IoT Server 3.8.0 are used to personally identify you. However, the cookie
<p>Some cookies in Entgra IoT Server 4.1.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.</p>
<p>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.</p>
<p>This Cookie Policy is part of the IoT Server <a href="{{@app.context}}/privacy-policy">Privacy Policy.</a>
</p>
<h3>What does Entgra IoT Server 3.8.0 use cookies for?</h3>
<p>Cookies are used for two purposes in Entgra IoT Server 3.8.0.</p>
<h3>What does Entgra IoT Server 4.1.0 use cookies for?</h3>
<p>Cookies are used for two purposes in Entgra IoT Server 4.1.0.</p>
<ol>
<li>To identify you and provide security</li>
<li>To provide a satisfying user experience.</li>
</ol>
<h4><u>Preferences</u></h4>
<p>Entgra IoT Server 3.8.0 uses cookies to remember your settings and preferences and to auto-fill the
<p>Entgra IoT Server 4.1.0 uses cookies to remember your settings and preferences and to auto-fill the
fields to make your interactions with the site easier.</p>
<p>These cookies can not be used to personally identify you.</p>
<h4><u>Security</u></h4>
<ol>
<li>Entgra IoT Server 3.8.0 uses selected cookies to identify and prevent security risks. For example,
Entgra IoT Server 3.8.0 may use cookies to store your session information to prevent others from
<li>Entgra IoT Server 4.1.0 uses selected cookies to identify and prevent security risks. For
example,
Entgra IoT Server 4.1.0 may use cookies to store your session information to prevent others from
changing your password without your username and password.
</li>
<li>Entgra IoT Server 3.8.0 uses session cookie to maintain your active session.</li>
<li>Entgra IoT Server 3.8.0 may use a temporary cookie when performing multi-factor authentication and
<li>Entgra IoT Server 4.1.0 uses session cookie to maintain your active session.</li>
<li>Entgra IoT Server 4.1.0 may use a temporary cookie when performing multi-factor authentication
and
federated authentication.
</li>
<li>Entgra IoT Server 3.8.0 may use permanent cookies to detect the devices you have logged in
<li>Entgra IoT Server 4.1.0 may use permanent cookies to detect the devices you have logged in
previously. This is to to calculate the <b>risk level</b> associated with your current login
attempt. Using these cookies protects you and your account from possible attacks.
</li>
</ol>
<h4><u>Performance</u></h4>
<p>Entgra IoT Server 3.8.0 may use cookies to allow <b>Remember Me</b> functionalities.</p>
<p>Entgra IoT Server 4.1.0 may use cookies to allow <b>Remember Me</b> functionalities.</p>
<h4><u>Analytics</u></h4>
<p>Entgra IoT Server 3.8.0 as a product does not use cookies for analytical purposes.</p>
<p>Entgra IoT Server 4.1.0 as a product does not use cookies for analytical purposes.</p>
<h4><u>Third party cookies</u></h4>
<p>Using Entgra IoT Server 3.8.0 may cause third-party cookie to be set in your browser. Entgra IoT Server
3.8.0 has no control over how any of them operate. The third-party cookies that maybe set
<p>Using Entgra IoT Server 4.1.0 may cause third-party cookie to be set in your browser. Entgra IoT
Server
4.1.0 has no control over how any of them operate. The third-party cookies that maybe set
include:</p>
<ol>
<li>Any social login sites. For example, third-party cookies may be set when Entgra IoT Server 3.8.0
<li>Any social login sites. For example, third-party cookies may be set when Entgra IoT Server 4.1.0
is configured to use “social” or “federated” login, and you opt to login with your “Social
Account”.
</li>
@ -101,11 +105,12 @@
</ol>
<p>Entgra strongly advises you to refer the respective cookie policies of such sites carefully as Entgra has
no knowledge or use on these cookies.</p>
<h3>What type of cookies does Entgra IoT Server 3.8.0 use?</h3>
<p>Entgra IoT Server 3.8.0 uses persistent cookies and session cookies. A persistent cookie helps Entgra IS
<h3>What type of cookies does Entgra IoT Server 4.1.0 use?</h3>
<p>Entgra IoT Server 4.1.0 uses persistent cookies and session cookies. A persistent cookie helps
Entgra IS
3.8.0 to recognize you as an existing user so that it is easier to return to Entgra or interact with
Entgra IS 3.8.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.8.0 when you return to Entgra IoT Server 3.8.0.</p>
and will be read by Entgra IoT Server 4.1.0 when you return to Entgra IoT Server 4.1.0.</p>
<p>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.</p>
@ -114,9 +119,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 Entgra IoT Server 3.8.0.</p>
functionalities offered by Entgra IoT Server 4.1.0.</p>
<p>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 Entgra IoT Server 3.8.0
individuals (or their data protection officer, if applicable) running this Entgra IoT Server 4.1.0
instance.</p>
<h3>What are the cookies used?</h3>
<table class="table table-striped table-bordered">
@ -150,17 +155,17 @@
</tbody>
</table>
<h3>Disclaimer</h3>
<p>This cookie policy is only for illustrative purposes of the product Entgra IoT Server 3.8.0. The
<p>This cookie policy is only for illustrative purposes of the product Entgra IoT Server 4.1.0. The
content in the policy is technically correct at the time of the product shipment. The
entity,organization or individual that runs this Entgra IoT Server 4.0.0 instance has full authority
entity,organization or individual that runs this Entgra IoT Server 4.1.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 Entgra IoT Server 4.0.0. All data, including personal data is
controlled and processed by the entity, organization or individual running Entgra IoT Server 4.0.0.
including personal data contained in Entgra IoT Server 4.1.0. All data, including personal data is
controlled and processed by the entity, organization or individual running Entgra IoT Server 4.1.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
Entgra IoT Server 4.0.0 is used by such entities, organizations or persons.</p>
Entgra IoT Server 4.1.0 is used by such entities, organizations or persons.</p>
</div>
</div>
</div>

66
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs
Unescape View File

@ -36,18 +36,18 @@
<p>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.</p>
<h3>Privacy Policy</h3>
<p>This policy describes how Entgra IoT Server 4.0.0 captures your personal information, the purposes of
<p>This policy describes how Entgra IoT Server 4.1.0 captures your personal information, the purposes of
collection, and information about the retention of your personal information.
<p>Please note that this policy is for reference only, and is applicable for the software as a product.
Entgra and its developers have no access to the information held within Entgra IoT Server
4.0.0.Please see the Disclaimer section for more information. Entities, organisations or individuals
controlling the use and administration of Entgra IoT Server 4.0.0 should create their own privacy
controlling the use and administration of Entgra IoT Server 4.1.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.
<h3>What is personal information?</h3>
<p>Entgra IoT Server 4.0.0 considers anything related to you and by which you may be identified as your
<p>Entgra IoT Server 4.1.0 considers anything related to you and by which you may be identified as your
personal information.</p>
<p><b>Signing in to Entgra IoT Server 4.0.0</b></p>
<p><b>Signing in to Entgra IoT Server 4.1.0</b></p>
<ol>
<li>Your user name (except in cases where the user name created by your employer is under
contract)
@ -55,7 +55,7 @@
<li>IP address used to log in</li>
<li>Email address</li>
</ol>
<p><b>Enrolling a device with Entgra IoT Server 4.0.0</b></p>
<p><b>Enrolling a device with Entgra IoT Server 4.1.0</b></p>
<ul>
<li>Your device ID (e.g., phone or tablet), mobile number, IMEI number, and IMSI number</li>
<li>Your device’s location</li>
@ -64,7 +64,7 @@
memory usage
</li>
</ul>
<p>However, Entgra IoT Server 4.0.0 also collects the following information that is not considered
<p>However, Entgra IoT Server 4.1.0 also collects the following information that is not considered
personal information, but is used only for <b>statistical</b> purposes. The reason for this is that
this information can not be used to track you.
<ul>
@ -74,17 +74,18 @@
<li>Operating system and generic browser information</li>
</ul>
<h3>Collection of personal information</h3>
<p>Entgra IoT Server 4.0.0 collects your information only to serve your access requirements. For example:
<p>Entgra IoT Server 4.1.0 collects your information only to serve your access requirements. For
example:
<ul>
<li>Entgra IoT Server 4.0.0 uses your IP address to detect any suspicious login attempts to your
<li>Entgra IoT Server 4.1.0 uses your IP address to detect any suspicious login attempts to your
account.
<li>Entgra IoT Server 4.0.0 uses attributes like your first name, last name, etc., to provide a rich
<li>Entgra IoT Server 4.1.0 uses attributes like your first name, last name, etc., to provide a rich
and personalized user experience.
<li>Entgra IoT Server 4.0.0 uses your security questions and answers only to allow account recovery.
<li>Entgra IoT Server 4.1.0 uses your security questions and answers only to allow account recovery.
</li>
</ul>
<h4><u>Tracking Technologies</u></h4>
<p>Entgra IoT Server 4.0.0 collects your information by:</p>
<p>Entgra IoT Server 4.1.0 collects your information by:</p>
<ul>
<li>Collecting information from the user profile page where you enter your personal data.</li>
<li>Tracking your IP address with HTTP request, HTTP headers, and TCP/IP.</li>
@ -95,11 +96,11 @@
</li>
</ul>
<h3>Use of personal information</h3>
<p>Entgra IoT Server 4.0.0 will only use your personal information for the purposes for which it was
<p>Entgra IoT Server 4.1.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).</p>
<p>Entgra IoT Server 4.0.0 uses your personal information only for the following purposes.</p>
<p>Entgra IoT Server 4.1.0 uses your personal information only for the following purposes.</p>
<ul>
<li>To provide you with a personalized user experience. Entgra IoT Server 4.0.0 uses your name and
<li>To provide you with a personalized user experience. Entgra IoT Server 4.1.0 uses your name and
uploaded profile pictures for this purpose.
</li>
<li>To protect your account from unauthorized access or potential hacking attempts. Entgra IoT Server
@ -117,7 +118,7 @@
Server 4.0.0 will not keep any personal information after statistical calculations. Therefore,
the statistical report has no means of identifying an individual person.
</li>
<li>Entgra IoT Server 4.0.0 may use:</li>
<li>Entgra IoT Server 4.1.0 may use:</li>
<li>
<ol>
<li>IP Address to derive geographic information</li>
@ -126,28 +127,29 @@
</li>
</ul>
<h3>Disclosure of personal information</h3>
<p>Entgra IoT Server 4.0.0 only discloses personal information to the relevant applications (also known as
“Service Providers”) that are registered with Entgra IoT Server 4.0.0. These applications are
<p>Entgra IoT Server 4.1.0 only discloses personal information to the relevant applications (also
known as
“Service Providers”) that are registered with Entgra IoT Server 4.1.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.</p>
<h4>Legal process</h4>
<p>Please note that the organisation, entity or individual running Entgra IoT Server 4.0.0 may be
<p>Please note that the organisation, entity or individual running Entgra IoT Server 4.1.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.</p>
<h3>Storage of personal information</h3>
<h4><u>Where your personal information is stored</u></h4>
<p>Entgra IoT Server 4.0.0 stores your personal information in secured databases. Entgra IoT Server 4.0.0
exercises proper industry accepted security measures to protect the database where your personal
information is held.Entgra IoT Server 4.0.0 as a product does not transfer or share your data with any
third parties or locations.</p>
<p>Entgra IoT Server 4.0.0 may use encryption to keep your personal data with an added level of
<p>Entgra IoT Server 4.1.0 stores your personal information in secured databases. Entgra IoT Server
4.1.0 exercises proper industry accepted security measures to protect the database where your
personal information is held.Entgra IoT Server 4.1.0 as a product does not transfer or share your
data with any third parties or locations.</p>
<p>Entgra IoT Server 4.1.0 may use encryption to keep your personal data with an added level of
security.</p>
<h4><u>How long your personal information is retained</u></h4>
<p>Entgra IoT Server 4.0.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.</p>
<p>Entgra IoT Server 4.0.0 may keep hashed secrets to provide you with an added level of security. This
<p>Entgra IoT Server 4.1.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.</p>
<p>Entgra IoT Server 4.1.0 may keep hashed secrets to provide you with an added level of security. This
includes:</p>
<ul>
<li>Current password</li>
@ -157,15 +159,15 @@
<p>You can request the administrator to delete your account. The administrator is the administrator of
the tenant you are registered under, or the super-administrator if you do not use the tenant
feature.</p>
<p>Additionally, you can request to anonymize all traces of your activities that Entgra IoT Server 4.0.0
<p>Additionally, you can request to anonymize all traces of your activities that Entgra IoT Server 4.1.0
may have retained in logs, databases or analytical storage.</p>
<h3>More information</h3>
<h4><u>Changes to this policy</u></h4>
<p>Upgraded versions of Entgra IoT Server 4.0.0 may contain changes to this policy. Revisions to this
<p>Upgraded versions of Entgra IoT Server 4.1.0 may contain changes to this policy. Revisions to this
policy will be packaged within such upgrades and would only apply to users who choose to use upgraded
versions.</p>
<h4><u>Your choices</u></h4>
<p>If you are already have an user account within Entgra IoT Server 4.0.0 ; you have the right to
<p>If you are already have an user account within Entgra IoT Server 4.1.0 ; you have the right to
deactivate your account if you find that this privacy policy is unacceptable to you.</p>
<p>If you do not have an account and you do not agree with our privacy policy, you can chose not to
create one.</p>
@ -174,14 +176,14 @@
<p><a href="https://entgra.io/contact/">https://entgra.io.com/contact/</a></p>
<h3>Disclaimer</h3>
<p>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 Entgra IoT Server 4.0.0. All
process or control any of the data, including personal data contained in Entgra IoT Server 4.1.0. All
data, including personal data is controlled and processed by the entity or individual running Entgra
IoT Server 4.0.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 Entgra IoT Server 4.0.0 is used by such entities or persons.</p>
purposes for which Entgra IoT Server 4.1.0 is used by such entities or persons.</p>
<p>This privacy policy is for the informational purposes of the entity or persons running Entgra IoT
Server 4.0.0 and sets out the processes and functionality contained within Entgra IoT Server 4.0.0
Server 4.0.0 and sets out the processes and functionality contained within Entgra IoT Server 4.1.0
regarding personal data protection. It is the responsibility of entities and persons running Entgra IoT
Server 4.0.0 to create and administer its own rules and processes governing users’ personal data,
Please note that the creation of such rules and processes may change the use, storage and disclosure

3
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in.login-do/login-do.hbs
Unescape View File

@ -60,9 +60,6 @@
<button class="wr-btn btn-download-agent">
Log in
</button>
<div id="register-link-wrapper" style="float: right; padding-top: 10px;">
<a href="{{@app.context}}/register" class="pull-right create-account">Create an account</a>
</div>
</div>
</form>
</div>

5
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.footer/footer.hbs
Unescape View File

@ -17,8 +17,9 @@
}}
{{#zone "footer"}}
<p>
<span class="hidden-xs">Entgra IoT Server 4.0.0</span>
<span class="visible-xs-inline">Entgra IoT Server 4.0.0</span> | © <script>document.write(new Date().getFullYear());</script>,
<span class="hidden-xs">Entgra IoT Server 4.1.0</span>
<span class="visible-xs-inline">Entgra IoT Server 4.1.0</span> | © <script>document.write(new Date()
.getFullYear());</script>,
<a href="http://wso2.com/" target="_blank"><i class="icon fw fw-wso2"></i> Inc</a>. All Rights Reserved.
</p>
{{/zone}}
Write Preview
Loading…
Cancel
Save