From 706894cd89847b44c3b83b4bff34b69ff5486d7a Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Wed, 21 Sep 2016 10:59:36 +0530 Subject: [PATCH] resolving conflicts --- .../templates/hidden-operations-android.hbs | 123 +- .../templates/hidden-operations-android.hbs | 2345 +++++++++-------- .../templates/hidden-operations-ios.hbs | 198 +- .../templates/hidden-operations-windows.hbs | 46 +- 4 files changed, 1392 insertions(+), 1320 deletions(-) diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs index cc8318d0d..50aaf2a43 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/templates/hidden-operations-android.hbs @@ -102,18 +102,17 @@ -
-
- This configuration can be used to set a passcode policy to an Android Device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configuration can be used to set a passcode policy to an Android Device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
- +
@@ -257,17 +256,17 @@ -
-
- This configurations can be used to restrict certain settings on an Android device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configurations can be used to restrict certain settings on an Android device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
+
@@ -696,18 +695,18 @@ -
-
- This configuration can be used to encrypt data on an Android device, when the device is - locked and - make it readable when the passcode is entered. Once this configuration profile is installed - on a device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to encrypt data on an Android device, when the device is + locked and + make it readable when the passcode is entered. Once this configuration profile is installed + on a device, + corresponding users will not be able to modify these settings on their devices. +
+ @@ -742,17 +741,17 @@ -
-
- This configurations can be used to configure Wi-Fi access on an Android device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configurations can be used to configure Wi-Fi access on an Android device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
+
Please note that * sign represents required fields of data.

@@ -907,14 +906,13 @@ -
-
- This configuration can be used to create a black list or white list of applications. -
+
+ This configuration can be used to create a black list or white list of applications. +
- +
@@ -1014,17 +1012,17 @@ -
-
- This configurations can be used to configure VPN settings on an Android device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configurations can be used to configure VPN settings on an Android device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
+
Please note that * sign represents required fields of data.

@@ -1089,16 +1087,15 @@ -
-
- The configurations below can be applied to the devices where the agent is running in Android - Work-Profile. -
+
+ The configurations below can be applied to the devices where the agent is running in Android + Work-Profile. +
- +
@@ -1193,19 +1190,18 @@ -
-
- This configuration can be used to set a passcode policy to an Android Device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configuration can be used to set a passcode policy to an Android Device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
- +
@@ -1345,19 +1341,18 @@ -
-
- This configuration can be used to set a passcode policy to an Android Device. - Once this configuration profile is installed on a device, corresponding users will not be - able - to modify these settings on their devices. -
+
+ This configuration can be used to set a passcode policy to an Android Device. + Once this configuration profile is installed on a device, corresponding users will not be + able + to modify these settings on their devices. +
- +
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs index bb5f8b3cb..84153dce3 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-android.hbs @@ -1,1480 +1,1569 @@
-
- +
+ - Passcode Policy - - - - - + Passcode Policy + + + + + - Restrictions - - - - - + Restrictions + + + + + - Encryption Settings - - - - - + Encryption Settings + + + + + - Wi-Fi Settings - - - - - + Wi-Fi Settings + + + + + - Virtual Private Network - - - - - + Virtual Private Network + + + + + - Work-Profile Configurations - - - - - + Work-Profile Configurations + + + + + - Applications Restrictions - - - - - + Applications Restrictions + + + + + -   System Update Policy (COSU) - - - - - +   System Update Policy (COSU) + + + + + - Whitelist Apps (COSU) - - - - -
+ Whitelist Apps (COSU) + + + + +
-
- -
-
- -
- - +
+
+ -
- +
-
- +
-
- + +
-
- + +
-
- + +
-
- + +
-
-
-
-
- - - -
-
- -
- -
-
+ + + +
+
+ +
+
+ +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
-
-
-
- - - -
-
- - -
-
- - Un-check following checkbox in case you do not need the device to be encrypted. -
-
-
-
+ + + +
+
+ +
+
+ + Un-check following checkbox in case you do not need the device to be encrypted. +
+
+
+ + +
+
+
-
-
-
- - - -
-
- -
- - - - - - - - - - - - - - - - - Please note that * sign represents required fields of data. -
-
- -
-
-
-
-
- - -
-
- -
- - +
+
+ - -
-
-
-
-
- - - -
-
- -
- Please note that * sign represents required fields of data. -
-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
- - +
+
+ - -
-
-
-
- -
-
- + +
+
+ -
+
- + -
-
-
- -
-
- + +
+
+ -
+
- + -
-
-
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-ios.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-ios.hbs index 718f213df..37a776b6f 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-ios.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-ios.hbs @@ -175,14 +175,13 @@ -
-
- This configuration can be used to set a passcode policy to an iOS Device. - Once this configuration profile is installed on a device, corresponding users - will not be able - to modify these settings on their devices. -
+
+ This configuration can be used to set a passcode policy to an iOS Device. + Once this configuration profile is installed on a device, corresponding users + will not be able + to modify these settings on their devices. +
@@ -399,17 +398,17 @@ -
-
- This configurations can be used to configure VPN settings on an iOS device. - Once this configuration profile is installed on a device, corresponding users will not - be able - to modify these settings on their devices. -
+
+ This configurations can be used to configure VPN settings on an iOS device. + Once this configuration profile is installed on a device, corresponding users will not + be able + to modify these settings on their devices. +
+
Please note that * sign represents required fields of data.

@@ -1173,18 +1172,18 @@ Please note that * sign represents required fields of data. -
-
- This configuration can be used to configure add-on VPN software (per-app VPN), - and it works only on VPN services of - type 'VPN'. Once this configuration profile is installed on a device, - corresponding users will not be able - to modify these settings on their devices. -
+
+ This configuration can be used to configure add-on VPN software (per-app VPN), + and it works only on VPN services of + type 'VPN'. Once this configuration profile is installed on a device, + corresponding users will not be able + to modify these settings on their devices. +
+
Please note that * sign represents required fields of data.

@@ -1408,16 +1407,15 @@ Please note that * sign represents required fields of data. -
-
- This configuration can be used to create a black list or white list of - applications. -
+
+ This configuration can be used to create a black list or white list of + applications. +
- +
+
@@ -2397,18 +2395,17 @@ EAP-Fast Support : -
-
- These configurations can be used to define settings for connecting - to your POP or IMAP email accounts. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -
+
+ These configurations can be used to define settings for connecting + to your POP or IMAP email accounts. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +
- +
@@ -2768,19 +2765,18 @@ Outgoing Mail Settings : -
-
- This configuration can be used to define settings for connecting to AirPlay - destinations. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -

(This feature is supported only on iOS 7.0 and later.) -
+
+ This configuration can be used to define settings for connecting to AirPlay + destinations. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +

(This feature is supported only on iOS 7.0 and later.) +
- +
@@ -2950,18 +2946,17 @@ Outgoing Mail Settings : -
-
- This configuration can be used to define settings for connecting to LDAP - servers. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to define settings for connecting to LDAP + servers. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +
- +
@@ -3138,18 +3133,17 @@ Outgoing Mail Settings : -
-
- This configuration can be used to define settings for connecting to CalDAV - servers. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to define settings for connecting to CalDAV + servers. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +
- +
@@ -3263,17 +3257,16 @@ Outgoing Mail Settings : -
-
- This configuration can be used to define settings for calendar subscriptions. - Once this configuration profile is installed on an iOS device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to define settings for calendar subscriptions. + Once this configuration profile is installed on an iOS device, + corresponding users will not be able to modify these settings on their devices. +
- +
- +
@@ -3489,21 +3481,20 @@ Outgoing Mail Settings : -
-
- These configurations can be used to specify Cellular Network Settings on an iOS - device. - Cellular settings cannot be installed if an APN setting is already installed and - upon successful installation, corresponding users will not be able to modify - these - settings on their devices. -

(This feature is supported only on iOS 7.0 and later.) -
+
+ These configurations can be used to specify Cellular Network Settings on an iOS + device. + Cellular settings cannot be installed if an APN setting is already installed and + upon successful installation, corresponding users will not be able to modify + these + settings on their devices. +

(This feature is supported only on iOS 7.0 and later.) +
- +
@@ -3677,18 +3668,17 @@ Outgoing Mail Settings : -
-
- These configurations can be used to restrict apps, device features and - media content available on an iOS device. Once this configuration profile is installed - on a device, corresponding users will not be able to modify these settings on their - devices. -
+
+ These configurations can be used to restrict apps, device features and + media content available on an iOS device. Once this configuration profile is installed + on a device, corresponding users will not be able to modify these settings on their + devices. +
- +
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-windows.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-windows.hbs index 172fff975..c05725b89 100644 --- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-windows.hbs +++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.view/public/templates/hidden-operations-windows.hbs @@ -78,16 +78,15 @@ -
-
- This configuration can be used to set a passcode policy to an Windows Device. - Once this configuration profile is installed on a device, corresponding users will not be able - to modify these settings on their devices. -
+
+ This configuration can be used to set a passcode policy to an Windows Device. + Once this configuration profile is installed on a device, corresponding users will not be able + to modify these settings on their devices. +
- +
@@ -221,15 +220,15 @@ -
-
- This configuration can be used to restrict the usage of camera on an Windows device together with all the applications using the camera. - Once this configuration profile is installed on a device, corresponding users will not be able - to modify these settings on their devices. -
+
+ This configuration can be used to restrict the usage of camera on an Windows device together with all the applications using the camera. + Once this configuration profile is installed on a device, corresponding users will not be able + to modify these settings on their devices. +
+
@@ -262,15 +261,15 @@ -
-
- This configuration can be used to encrypt data on an Windows device, when the device is locked and - make it readable when the passcode is entered. Once this configuration profile is installed on a device, - corresponding users will not be able to modify these settings on their devices. -
+
+ This configuration can be used to encrypt data on an Windows device, when the device is locked and + make it readable when the passcode is entered. Once this configuration profile is installed on a device, + corresponding users will not be able to modify these settings on their devices. +
+
@@ -303,14 +302,13 @@ -
-
- This configuration can be used to create a black list or white list of applications. -
+
+ This configuration can be used to create a black list or white list of applications. +
- +