Merge branch 'master' into 'master'

Bumping product versions

See merge request entgra/carbon-device-mgt!167

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

@@ -90,7 +90,7 @@
                 <p>Entgra IoT Server 3.6.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.6.0 may cause third-party cookie to be set in your browser. Entgra IoT Server
-                   3.5.0 has no control over how any of them operate. The third-party cookies that maybe set
+                   3.6.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.6.0
@@ -103,8 +103,8 @@
                    no knowledge or use on these cookies.</p>
                 <h3>What type of cookies does Entgra IoT Server 3.6.0 use?</h3>
                 <p>Entgra IoT Server 3.6.0 uses persistent cookies and session cookies. A persistent cookie helps Entgra IS
-                   3.5.0 to recognize you as an existing user so that it is easier to return to Entgra or interact with
+                   3.6.0 to recognize you as an existing user so that it is easier to return to Entgra or interact with
-                   Entgra IS 3.5.0 without signing in again. After you sign in, a persistent cookie stays in your browser
+                   Entgra IS 3.6.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.6.0 when you return to Entgra IoT Server 3.6.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

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

@@ -40,7 +40,7 @@
                    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
-                   3.5.0.Please see the Disclaimer section for more information. Entities, organisations or individuals
+                   3.6.0.Please see the Disclaimer section for more information. Entities, organisations or individuals
                    controlling the use and administration of Entgra IoT Server 3.6.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.
@@ -103,7 +103,7 @@
                         uploaded profile pictures for this purpose.
                     </li>
                     <li>To protect your account from unauthorized access or potential hacking attempts. Entgra IoT Server
-                        3.5.0 uses HTTP or TCP/IP Headers for this purpose.
+                        3.6.0 uses HTTP or TCP/IP Headers for this purpose.
                     </li>
                     <li>
                         <p>This includes:</p>
@@ -114,7 +114,7 @@
                         </ol>
                     </li>
                     <li>Derive statistical data for analytical purposes on system performance improvements. Entgra IoT
-                        Server 3.5.0 will not keep any personal information after statistical calculations. Therefore,
+                        Server 3.6.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 3.6.0 may use:</li>
@@ -176,17 +176,17 @@
                 <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 3.6.0. All
                    data, including personal data is controlled and processed by the entity or individual running Entgra
-                   IoT Server 3.5.0. Entgra, its employees partners and affiliates are not a data processor or a data
+                   IoT Server 3.6.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 3.6.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 3.5.0 and sets out the processes and functionality contained within Entgra IoT Server 3.6.0
+                   Server 3.6.0 and sets out the processes and functionality contained within Entgra IoT Server 3.6.0
                    regarding personal data protection. It is the responsibility of entities and persons running Entgra IoT
-                   Server 3.5.0 to create and administer its own rules and processes governing users’ personal data,
+                   Server 3.6.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
                    policies contained herein. Therefore users should consult the entity or persons running Entgra IoT
-                   Server 3.5.0 for its own privacy policy for details governing users’ personal data.</p>
+                   Server 3.6.0 for its own privacy policy for details governing users’ personal data.</p>
             </div>
         </div>
     </div>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs

@@ -17,8 +17,8 @@
 }}
 {{#zone "footer"}}
     <p>
-        <span class="hidden-xs">Entgra IoT Server{{#unless isCloud}} 3.5.0{{/unless}}</span>
+        <span class="hidden-xs">Entgra IoT Server{{#unless isCloud}} 3.6.0{{/unless}}</span>
-        <span class="visible-xs-inline">Entgra IoT Server{{#unless isCloud}} 3.5.0{{/unless}}</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
+        <span class="visible-xs-inline">Entgra IoT Server{{#unless isCloud}} 3.6.0{{/unless}}</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
         <a href="https://www.entgra.io/" target="_blank">Entgra</a>. All Rights Reserved.
     </p>
 {{/zone}}