Commit Graph

1031 Commits

Author SHA1 Message Date
Chathura Ekanayake
00e3ac8251 implementing appmanager subscriptions 2017-09-25 10:25:03 +05:30
megala21
f3bca0f88c Merging with master 2017-07-25 11:19:46 +05:30
geethkokila
fe371ae693 Fixing the activity issue with large data set 2017-07-20 20:26:59 +05:30
Rasika Perera
575d06f513 Geofencing refactoring 2017-07-20 17:26:44 +05:30
Hasunie
ac3e110583 fixing updateEnrollment status issue 2017-07-18 13:45:03 +05:30
sameera910409
9db742e95a fixing https://github.com/wso2/product-iots/issues/1136 : DeviceDetailsRetrieverTask attempts to add operations to a device that has been removed 2017-07-18 00:17:26 +05:30
geethkokila
afe312152f Fixing https://github.com/wso2/product-iots/issues/1007 2017-07-17 14:43:06 +05:30
Rasika Perera
78187c4ec1 Increasing location street column size 2017-07-16 16:00:19 +05:30
Rasika Perera
9db4ddd4df Merge pull request #832 from rasika/geo-fencing
Hiding geo dashboard tools when GeoLocationConfiguration is Disabled
2017-07-07 18:39:02 +05:30
Rasika Perera
972465b61e Fixes https://github.com/wso2/product-iots/issues/1089, https://github.com/wso2/product-iots/issues/1120 2017-07-07 17:16:28 +05:30
Rasika Perera
83d0793a35 Hiding geo dashboard tools when GeoLocationConfiguration is Disabled 2017-07-07 06:58:58 +05:30
geethkokila
fe67d251d5 Fixing the #460 issue 2017-07-06 11:57:04 +05:30
Rasika Perera
186b49395e Fixing https://github.com/wso2/product-iots/issues/685: When user removed, all associated devices removed 2017-06-30 14:59:24 +05:30
ayyoob
2dab109ad3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-22 16:56:34 +05:30
geethkokila
1655b512b0 Fixing formating issues 2017-06-22 15:55:22 +05:30
geethkokila
5f71313af1 Fixing formating issues 2017-06-22 15:53:11 +05:30
geethkokila
07357124b0 Fixing the task for all the tenants 2017-06-22 15:45:11 +05:30
ayyoob
6c041c7b6a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-22 04:34:45 +05:30
sinthuja
ee8f29503d Merge branch 'wso2-master' 2017-06-21 16:31:06 +05:30
sinthuja
8197547383 Fixing MSSQL related issues, and dbscript issues. 2017-06-21 16:30:19 +05:30
ayyoob
80cc690a42 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-21 04:11:40 +05:30
Geeth
3deffa99dd Merge pull request #790 from dunithd/master
Adding an API method to retrieve an activity by it's ID and a device ID
2017-06-20 22:27:42 +05:30
sinthuja
4bfd35cc74 Fixing issue in mssql database issue in processor. 2017-06-20 18:54:36 +05:30
sinthuja
5570349cd1 Reverting back the other databases to use the arrays. 2017-06-20 18:05:39 +05:30
dunithd
4cf3e2d421 Adding an API method to retrieve an activity by it's ID and a device ID 2017-06-20 17:44:22 +05:30
sinthuja
f59202c0c3 Reverting back to the debug logs. 2017-06-20 13:46:39 +05:30
sinthuja
ade596d3c4 Merging the AS clause removal queries with generic DAO from oracle. 2017-06-20 13:17:03 +05:30
sinthuja
9398e7ee0b Merge branch 'wso2-master'
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationMappingDAOImpl.java
2017-06-19 23:10:15 +05:30
sinthuja
124c0b4cf8 Fixing issues related to oracle database. 2017-06-19 23:05:05 +05:30
Harshan Liyanage
b8f085da20 Added null checks for device cache in-case cache is disabled. 2017-06-19 16:58:42 +05:30
Harshan Liyanage
074ceeb0c7 Merged with master 2017-06-19 12:46:22 +05:30
Harshan Liyanage
967efa1fee Fixed user enrolled device showing problem which resolves wso2/product-iots#406 2017-06-19 12:41:22 +05:30
ayyoob
3b7d4d8966 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-17 19:17:42 +05:30
ayyoob
ca33f035df merge ui fixes 2017-06-17 18:52:25 +05:30
Ayyoob Hamza
2875fb2ca0 Merge pull request #755 from rasika/geo-fencing
Added Geo Service into Device Mgt Core
2017-06-17 12:20:10 +05:30
Harshan Liyanage
d8b756df3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-16 16:48:30 +05:30
Harshan Liyanage
8b9420766f Fixed SQL syntax issue in DeviceStatusMonitoring Task when running on PostgreSQL. 2017-06-16 16:47:34 +05:30
Harshan Liyanage
51c18d2108 Added pagination support for group-management for major db engines. 2017-06-16 16:46:30 +05:30
Rasika Perera
8da1f62cd9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-16 15:50:45 +05:30
Madawa Soysa
98e8dfea68 Merge pull request #781 from inoshperera/master
fixing the agent unable to enroll issue
2017-06-16 15:29:22 +05:30
inoshperera
58b2bf8b3c fixing the agent unable to enroll issue 2017-06-16 15:23:41 +05:30
madhawap
a115cff4db reformatting code 2017-06-16 13:16:29 +05:30
sinthuja
1c13269fc8 Fixing https://github.com/wso2/product-iots/issues/495. 2017-06-16 11:50:54 +05:30
Harshan Liyanage
de9beb1f5b Code refatcored. 2017-06-15 14:49:40 +05:30
ayyoob
07bdd5cb6c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-14 13:19:07 +05:30
ayyoob
da68f8fac1 fixed on config operation flow 2017-06-14 12:38:56 +05:30
Chatura Dilan
38b7689e28 Merge pull request #773 from harshanL/master
Fixed java-doc comments issues and added comments to the configs.
2017-06-14 12:35:39 +05:30
Harshan Liyanage
b510a422b4 Fixed java-doc comments issues and added comments to the configs. 2017-06-14 12:28:16 +05:30
Geeth
115ccb739a Merge pull request #765 from harshanL/master
Added comments to the device status configs.
2017-06-14 11:42:21 +05:30
Rasika Perera
798e551673 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-14 10:43:19 +05:30