amalka.subasinghe
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cloud-3.1.0' into cloud-3.1.0

Browse Source
revert-dabc3590
Imesh Chandrasiri 8 years ago committed by GitHub
parent 67313882ed 32c50e0ef7
commit 37b032d710
16 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
Unescape View File

@ -56,7 +56,7 @@ import javax.ws.rs.core.Response;
}
),
tags = {
@Tag(name = "android_sense", description = "")
@Tag(name = "android_sense,device_management", description = "")
}
)
@Scopes(

2
components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/impl/ArduinoService.java
Unescape View File

@ -40,7 +40,7 @@ import javax.ws.rs.core.Response;
}
),
tags = {
@Tag(name = "arduino", description = "")
@Tag(name = "arduino,device_management", description = "")
}
)
@Scopes(

2
components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiService.java
Unescape View File

@ -39,7 +39,7 @@ import javax.ws.rs.core.Response;
}
),
tags = {
@Tag(name = "raspberrypi", description = "")
@Tag(name = "raspberrypi,device_management", description = "")
}
)
@Scopes(

2
components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmService.java
Unescape View File

@ -45,7 +45,7 @@ import javax.ws.rs.core.Response;
}
),
tags = {
@Tag(name = "virtual_firealarm", description = "")
@Tag(name = "virtual_firealarm,device_management", description = "")
}
)
@Scopes(

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementAdminService.java
Unescape View File

@ -58,7 +58,7 @@ import java.util.List;
}
),
tags = {
@Tag(name = "android", description = "")
@Tag(name = "android,device_management", description = "")
}
)
@Path("/admin/devices")

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceManagementService.java
Unescape View File

@ -56,7 +56,7 @@ import java.util.List;
}
),
tags = {
@Tag(name = "android", description = "")
@Tag(name = "android,device_management", description = "")
}
)
@Api(value = "Android Device Management",

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/DeviceTypeConfigurationService.java
Unescape View File

@ -55,7 +55,7 @@ import javax.ws.rs.core.Response;
}
),
tags = {
@Tag(name = "android", description = "")
@Tag(name = "android,device_management", description = "")
}
)
@Api(value = "Android Configuration Management", description = "This API carries all the resource used to mange the Android platform configurations.")

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/EventReceiverService.java
Unescape View File

@ -53,7 +53,7 @@ import javax.ws.rs.core.Response;
}
),
tags = {
@Tag(name = "android", description = "")
@Tag(name = "android,device_management", description = "")
}
)
@Api(value = "Event Receiver", description = "Event publishing/retrieving related APIs. To enable event publishing/retrieving you need to" +

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
Unescape View File

@ -339,6 +339,7 @@
data-locations="{{device.locationHistory}}">
</div>
<br/>
{{#unless isCloud}}
<a class="padding-left" target="_blank"
href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{anchor}}">
<span class="fw-stack">
@ -346,6 +347,7 @@
<i class="fw fw-map-location fw-stack-1x"></i>
</span> Add Geo Fencing
</a>
{{/unless}}
{{else}}
<div id="map-error" class="message message-warning">
<h4 class="remove-margin">

1
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
Unescape View File

@ -213,6 +213,7 @@ function onRequest(context) {
deviceViewData["autoCompleteParams"] = autoCompleteParams;
deviceViewData["portalUrl"] = devicemgtProps['portalURL'];
deviceViewData["isCloud"] = devicemgtProps['isCloud'];
deviceViewData["anchor"] = encodeURI(JSON.stringify({ "device" : { "id" : deviceId, "type" : deviceType}}));
return deviceViewData;
}

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js
Unescape View File

@ -28,7 +28,7 @@ function loadLeafletMap() {
zoomLevel = 13,
tileSet = "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
attribution = "&copy; <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors";
if (locations) {
if (locations && locations.locations.length > 0) {
var locationSets = locations.locations;
map = L.map(container).setView([locationSets[0].lat, locationSets[0].lng], zoomLevel);

3
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs
Unescape View File

@ -95,9 +95,6 @@
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
<h3 class="uppercase">Prepare</h3><hr>
<ul class="list-unstyled">

1
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.js
Unescape View File

@ -34,6 +34,7 @@ function onRequest(context){
// //do nothing.
// }
//);
viewModel["isCloud"] = devicemgtProps["isCloud"];
viewModel["hostName"] = devicemgtProps["httpsURL"];
viewModel["enrollmentURL"] = devicemgtProps["generalConfig"]["host"] + devicemgtProps["androidEnrollmentDir"];
return viewModel;

2
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/ConfigurationMgtService.java
Unescape View File

@ -62,7 +62,7 @@ import javax.ws.rs.core.Response;
}
),
tags = {
@Tag(name = "windows", description = "")
@Tag(name = "windows,device_management", description = "")
}
)
@Api(value = "Windows Configuration Management",

2
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/DeviceManagementAdminService.java
Unescape View File

@ -55,7 +55,7 @@ import java.util.List;
}
),
tags = {
@Tag(name = "windows", description = "")
@Tag(name = "windows,device_management", description = "")
}
)
@Api(value = "Windows Device Management Administrative Service",

2
components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/authbst/BSTProvider.java
Unescape View File

@ -51,7 +51,7 @@ import javax.ws.rs.core.Response;
}
),
tags = {
@Tag(name = "windows", description = "")
@Tag(name = "windows,device_management", description = "")
}
)
@Api(value = "Windows Binary Security Token Service",

Write Preview
Loading…
Cancel
Save