community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolving conflicts

Browse Source
This commit is contained in:
thusithakalugamage 2016-09-21 10:59:36 +05:30
parent c4c2df3723
commit 706894cd89
4 changed files with 1395 additions and 1323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
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
View File

@ -102,18 +102,17 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="passcode-policy-body">
<hr/>
<div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -257,17 +256,17 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="camera-body">
<hr/>
<div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -696,7 +695,7 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
This configuration can be used to encrypt data on an Android device, when the device is
locked and
@ -704,10 +703,10 @@
on a device,
corresponding users will not be able to modify these settings on their devices.
</div>
</h2>
</div>
<div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="encrypt-storage-body">
</hr>
<div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -742,17 +741,17 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="wifi-body">
<hr/>
Please note that * sign represents required fields of data.
<br>
<br>
@ -907,14 +906,13 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
This configuration can be used to create a black list or white list of applications.
</div>
</h2>
</div>
<div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="app-restriction-body">
<hr/>
<div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -1014,17 +1012,17 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="vpn-body">
<hr/>
Please note that * sign represents required fields of data.
<br>
<br>
@ -1089,16 +1087,15 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
The configurations below can be applied to the devices where the agent is running in Android
Work-Profile.
</div>
</h2>
</div>
<div id="work-profile-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="work-profile-policy-body">
<hr/>
<div id="work-profile-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -1193,19 +1190,18 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-system-update-policy-body">
<hr/>
<div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -1345,19 +1341,18 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-whitelist-applications-body">
<hr/>
<div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>

803
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
View File

File diff suppressed because it is too large Load Diff

60
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
View File

@ -175,14 +175,13 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="passcode-policy-body">
@ -399,17 +398,17 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="vpn-body">
<hr/>
Please note that * sign represents required fields of data.
<br>
<br>
@ -1173,7 +1172,7 @@ Please note that * sign represents required fields of data.
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
This configuration can be used to configure add-on VPN software (per-app VPN),
and it works only on VPN services of
@ -1181,10 +1180,10 @@ Please note that * sign represents required fields of data.
corresponding users will not be able
to modify these settings on their devices.
</div>
</h2>
</div>
<div id="per-app-vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="per-app-vpn-body">
<hr/>
Please note that * sign represents required fields of data.
<br>
<br>
@ -1408,16 +1407,15 @@ Please note that * sign represents required fields of data.
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
This configuration can be used to create a black list or white list of
applications.
</div>
</h2>
</div>
<div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="app-restriction-body">
<hr/>
<div id="app-restriction-feature-error-msg" class="alert alert-danger hidden"
role="alert">
<i class="icon fw fw-error"></i><span></span>
@ -1523,7 +1521,7 @@ Please note that * sign represents required fields of data.
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
These configurations can be used to set how devices connect to your wireless network(s),
including the necessary authentication
@ -1531,10 +1529,10 @@ Please note that * sign represents required fields of data.
corresponding users will not be able
to modify these settings on their devices.
</div>
</h2>
</div>
<div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="wifi-body">
<hr/>
<div id="wifi-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -2397,18 +2395,17 @@ EAP-Fast Support :
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="email-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="email-body">
<hr/>
<div id="email-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -2768,7 +2765,7 @@ Outgoing Mail Settings :
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
This configuration can be used to define settings for connecting to AirPlay
destinations.
@ -2776,11 +2773,10 @@ Outgoing Mail Settings :
corresponding users will not be able to modify these settings on their devices.
<br><br>(This feature is supported only on iOS 7.0 and later.)
</div>
</h2>
</div>
<div id="airplay-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="airplay-body">
<hr/>
<div id="airplay-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -2950,18 +2946,17 @@ Outgoing Mail Settings :
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="ldap-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="ldap-body">
<hr/>
<div id="ldap-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -3138,18 +3133,17 @@ Outgoing Mail Settings :
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="calendar-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="calendar-body">
<hr/>
<div id="calendar-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -3263,17 +3257,16 @@ Outgoing Mail Settings :
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="calendar-subscription-body" class="panel-collapse panel-body collapse"
role="tabpanel" aria-labelledby="calendar-subscription-body">
<hr/>
<div id="calendar-subscription-feature-error-msg" class="alert alert-danger hidden"
role="alert">
<i class="icon fw fw-error"></i><span></span>
@ -3362,7 +3355,7 @@ Outgoing Mail Settings :
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
These configurations can be used to specify Access Point Names ( APN ).
Once this configuration profile is installed on an iOS device, corresponding
@ -3370,11 +3363,10 @@ Outgoing Mail Settings :
be able to modify these settings on their devices.
<br><br>(This feature is not supported on iOS 7.0 and later.)
</div>
</h2>
</div>
<div id="apn-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="apn-body">
<hr/>
<div id="apn-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -3489,7 +3481,7 @@ Outgoing Mail Settings :
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
These configurations can be used to specify Cellular Network Settings on an iOS
device.
@ -3499,11 +3491,10 @@ Outgoing Mail Settings :
settings on their devices.
<br><br>(This feature is supported only on iOS 7.0 and later.)
</div>
</h2>
</div>
<div id="cellular-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cellular-body">
<hr/>
<div id="cellular-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -3677,18 +3668,17 @@ Outgoing Mail Settings :
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="restrictions-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="restrictions-body">
<hr/>
<div id="restrictions-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>

18
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
View File

@ -78,16 +78,15 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="passcode-policy-body">
<hr/>
<div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -221,15 +220,15 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="camera-body">
<hr/>
<div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -262,15 +261,15 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
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.
</div>
</h2>
</div>
<div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="encrypt-storage-body">
<hr/>
<div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>
@ -303,14 +302,13 @@
<span class="helper"></span>
<span class="text"></span>
</label>
<hr>
</h2>
<div class="panel-title-description">
This configuration can be used to create a black list or white list of applications.
</div>
</h2>
</div>
<div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel" aria-labelledby="app-restriction-body">
<hr/>
<div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span>
</div>