Commit Graph

533 Commits

Author SHA1 Message Date
lasantha
fe576c0aac Adding required API endpoints to mograte from prior verisons of IoTS 3.1.0 to IoTS 3.1.0 2017-11-28 10:51:52 +05:30
Gathika94
f4af47fae4 added unit and page 2017-11-22 21:42:54 +05:30
Gathika94
2e082fbbb7 removed unnecessary classes 2017-11-22 16:32:14 +05:30
Gathika94
ad061d09a6 device details can be get through the api 2017-11-22 16:06:31 +05:30
Gathika94
f5d1ab7403 backend api working properly 2017-11-22 16:06:31 +05:30
Gathika94
c74a56cb45 geo hash algorithm 2017-11-22 16:06:31 +05:30
Gathika94
d3eb32b5cc working on ui features 2017-11-22 16:06:31 +05:30
Gathika94
4eb66f4e6b api for getting devices in geo grid working fine 2017-11-22 16:06:31 +05:30
warunalakshitha
22c4753f74 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control 2017-11-17 14:46:42 +05:30
Charitha Goonetilleke
44592b2043
Revert "Resolving conflicts for Remote Control feature on behalf of Waruna" 2017-11-17 14:33:45 +05:30
Ace
4b2955984f Resolving conflicts for Remote Control feature on behalf of Waruna 2017-11-17 14:27:30 +05:30
Charitha Goonetilleke
448ff20baa
Update response message 2017-10-30 12:09:12 +05:30
charitha
b3094277fd Merge branch 'master' into add-emm-analytics
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/util/Utils.java
2017-10-30 10:11:15 +05:30
megala21
7c92849a03 Adding test cases for GroupManagementService 2017-10-20 15:26:14 +05:30
megala21
5f0712dd38 Refactoring 2017-10-19 16:54:16 +05:30
megala21
37248de07f Adding test cases for notification managementservice 2017-10-19 16:47:35 +05:30
megala21
68533808c5 Adding test cases for UserManagementServicee 2017-10-19 15:43:41 +05:30
Menaka Jayawardena
ce7b28f2fb Removed unthrown Exception. 2017-10-13 15:23:53 +05:30
Madawa Soysa
80eb7d2c28 Initial unit tests for device management rest API
This commit includes seting up testNG, jacoco for the device.mgt.api module
2017-10-12 15:35:27 +05:30
warunalakshitha
7c371a0e23 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control 2017-10-11 17:47:29 +05:30
sinthuja
2d6b336ea5 Removing the unused component usage 2017-10-10 15:22:08 +05:30
charitha
9f94f86401 Rename GeoAnalyticsConfigurations to OperationAnalyticsConfiguration 2017-10-06 13:38:03 +05:30
warunalakshitha
719dd24d57 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control 2017-10-01 10:50:04 +05:30
warunalakshitha
14478aa7a5 add remote session config service 2017-10-01 10:48:11 +05:30
sinthuja
ba03bccd4c Adding more testcases and fixes. 2017-09-28 12:46:03 +05:30
geethkokila
a7e41faa19 Adding descriptive error message 2017-09-17 17:55:34 +05:30
geethkokila
fe30a05b81 Adding the API to retrieve device information 2017-09-16 21:19:35 +05:30
Harshan Liyanage
46761ed76d Resolved wso2/product-iots#1348 2017-09-13 14:23:08 +05:30
Harshan Liyanage
fbc72a3c63 Minor refactoring related to wso2/product-iots#1035 2017-09-04 12:31:41 +05:30
Harshan Liyanage
5906546dfb Minor refactoring related to wso2/product-iots#1035 2017-09-04 11:56:56 +05:30
Harshan Liyanage
a3aa259437 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-04 10:06:40 +05:30
Harshan Liyanage
79abb6ef86 Fixed merge conflicts. 2017-09-01 20:40:42 +05:30
Harshan Liyanage
bbbd199cf7 Resolved wso2/product-iots#1035 2017-09-01 20:30:37 +05:30
Pasindu
54b69747ce Fixes issue in modal displaying group name 2017-09-01 17:57:11 +05:30
Pasindu
0684257a6c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-09-01 17:01:28 +05:30
sinthuja
e6b8af986b Adding the specific imports. 2017-09-01 16:48:50 +05:30
sinthuja
bb5afb07b7 Adding the class back which I mistaken deleted. 2017-09-01 16:47:33 +05:30
sinthuja
c4c30f5856 Fixing imports. 2017-09-01 16:45:23 +05:30
Pasindu
1581775aa6 Fixes validation issue in create group 2017-09-01 15:38:28 +05:30
sinthuja
61ac576d6c Fixing https://github.com/wso2/product-iots/issues/1376. 2017-09-01 15:34:34 +05:30
sinthuja
c53e027701 Fixing https://github.com/wso2/product-iots/issues/1374. 2017-09-01 13:02:13 +05:30
sinthuja
c308147357 Fixing https://github.com/wso2/product-iots/issues/354. 2017-08-31 18:13:42 +05:30
sinthuja
ddb8f4e9b3 Fixing https://github.com/wso2/product-iots/issues/353. 2017-08-31 16:53:57 +05:30
sinthuja
e6ff84918e Merge branch 'wso2-master'
# Conflicts:
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/IntegrationClientServiceImpl.java
#	components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/CredentialManagementResponseBuilder.java
2017-08-31 15:38:00 +05:30
sinthuja
465d801f42 Fixing https://github.com/wso2/product-iots/issues/1356. 2017-08-31 15:34:33 +05:30
warunalakshitha
a5e22c652b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into remote-control 2017-08-31 11:52:39 +05:30
Nirothipan
46921ac277 Resolving conflicts 2017-08-30 17:06:48 +05:30
Nirothipan
955fe4b4b5 checking message 2017-08-30 16:50:26 +05:30
Nirothipan
9d3b2ebf42 fixes for product-iots #504 2017-08-30 16:20:32 +05:30
amalhub
84ad02156b Resolves: https://github.com/wso2/product-iots/issues/1339, https://github.com/wso2/product-iots/issues/1300 2017-08-30 12:20:51 +05:30