Commit Graph

13 Commits

Author SHA1 Message Date
charitha
2cac0053ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImplTest.java
2018-08-13 12:20:51 +05:30
charitha
ead01f837d Fixed issue in Geo fencing 2018-07-26 12:23:47 +05:30
charitha
2bfd598c67 Add location extraction from device properties and deice type specific location retrieval 2018-07-23 11:35:17 +05:30
charitha
796acbda16 Add location extraction from device properties and deice type specific location retrieval 2018-07-11 10:28:14 +05:30
Arcane94
8c303911b0 Final frontend and backend changes 2018-03-14 12:05:21 +05:30
Charitha Goonetilleke
329e41b04c
Merge pull request #1197 from Arcane94/master
Fixed https://github.com/wso2/carbon-device-mgt/issues/1194
2018-03-14 04:25:21 +00:00
Arcane94
c0024ce26f Exception name change and minor modifications 2018-03-05 10:42:26 +05:30
lasantha
831fdcb335 Fix the issue in device-mgt-v0.9 copyright text 2018-03-05 01:29:32 +05:30
Arcane94
50503fc7c0 Fixing the issue when defining alerts with same name 2018-02-24 15:15:36 +05:30
lasantha
175c987b8a formatting device-location API 2018-02-23 14:29:49 +05:30
Rasika Perera
394f45f4bd Fixing https://github.com/wso2/product-iots/issues/1611 2018-01-22 15:43:07 +05:30
lasantha
11310a9145 default API set to newly added API and fixed it by using context parameters 2017-12-15 10:21:15 +05:30
lasantha
9a7745d915 Adding new API version for backward compatibility 2017-12-12 18:20:37 +05:30