992 Commits

Author	SHA1	Message	Date
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 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
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
Harshan Liyanage	43ba1e1b43	Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005	2017-06-13 17:08:26 +05:30
Vishanth	7da1067d68	fixing sql queries to compare owner in lowercase	2017-06-13 17:08:01 +05:30
Rasika Perera	ce6ab9b354	Refactoring "executionPlanType" -> "alertType"	2017-06-12 22:43:14 +05:30
Rasika Perera	6d02075a99	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing	2017-06-12 15:11:14 +05:30
Harshan Liyanage	3766ba0349	Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991	2017-06-07 16:29:05 +05:30
Rasika Perera	05b11a5099	Adding Exit Alerts feature	2017-06-06 14:55:04 +05:30
Rasika Perera	8548e911aa	Added an error message when gpl siddhi extension is not configured	2017-06-06 06:18:27 +05:30
Rasika Perera	ec343cef1a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing	2017-06-05 10:26:10 +05:30
Rasika Perera	fb368caae4	Removed unused gson initization	2017-06-05 10:16:03 +05:30
Rasika Perera	9865a260d4	Publishing location operation response into iot location event stream	2017-06-05 10:12:22 +05:30
Rasika Perera	2733197edc	PublishLocationOperationResponse config element added to cdm-config.xml	2017-06-05 10:10:29 +05:30
Harshan Liyanage	9871122c0a	Code refactoring of device-status-task which Resolves harshanl/product-iots#518	2017-06-02 15:36:56 +05:30
Harshan Liyanage	52bbdfcd78	Code refactoring of device-status-task which Resolves harshanl/product-iots#518	2017-06-02 15:23:51 +05:30
Harshan Liyanage	d3cb7ba70b	Changed the device-status-task to use optimized queries which Resolves harshanl/product-iots#518	2017-06-02 15:07:39 +05:30
Harshan Liyanage	4ec139608e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-05-30 17:00:52 +05:30
Harshan Liyanage	35d1c9897e	Resolves harshanl/product-iots#518	2017-05-30 17:00:23 +05:30
Rasika Perera	f864506f62	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing	2017-05-29 13:09:21 +05:30
Rasika Perera	ea3ed9c444	Added Geo Service into Device Mgt Core	2017-05-29 11:51:41 +05:30
warunalakshitha	1a26595472	Fix issue with using enrollment id for device id	2017-05-26 14:54:04 +05:30
Amal Gunatilake	3f7543bee8	Merge pull request #742 from milanperera/iot-master ... Removed unnecessary interace methods from Device Manager	2017-05-22 15:27:41 +05:30
sinthuja	3340d94acf	adding the if condition for only newRoles list iteration.	2017-05-18 16:00:25 +05:30
sinthuja	4df590caa1	Fixing https://github.com/wso2/product-iots/issues/447.	2017-05-16 18:17:45 +05:30
ayyoob	1c3a89f57c	fixed issues raised through comments - commits	2017-05-10 13:49:20 +05:30
ayyoob	cb9db4dd1d	fixed null pointer in the initial operations	2017-05-09 16:16:14 +05:30
Milan Perera	64d656b5e7	Removed unnecessary interace methods from Device Manager	2017-05-09 15:09:21 +05:30