957 Commits

Author	SHA1	Message	Date
ayyoob	a0d7518cbe	Implemented Pull Notification Support	2017-06-01 17:19:25 +05:30
ayyoob	dbdaa5a0e0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-05-29 05:44:36 +05:30
warunalakshitha	1a26595472	Fix issue with using enrollment id for device id	2017-05-26 14:54:04 +05:30
ayyoob	56faa75861	fixed analytics issues	2017-05-25 03:07:19 +05:30
ayyoob	75d6813d8a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-05-24 00:43:02 +05:30
ayyoob	4d22bc7064	fixed UI Issues	2017-05-24 00:26:02 +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
ayyoob	dd1c2e4338	Added few fixes after testing and added default UI for device type management	2017-05-22 02:51:35 +05:30
ayyoob	f945da194d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-05-19 01:56:40 +05:30
ayyoob	abc9315f95	Added Pluggable Device Type	2017-05-19 01:49:10 +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
Milan Perera	53f2c555c4	Added method to test device manager	2017-05-09 14:44:01 +05:30
Geeth	6798dea68a	Merge pull request #725 from warunalakshitha/master ... Add Scheduler Task for Sending Push Notification	2017-05-02 17:04:03 +05:30
warunalakshitha	e1e2b14b5f	Rename push status to push notification status and add configurable initial delay for scheduler task	2017-05-01 20:44:30 +05:30
lasantha	43f2f15c5f	#395: Resolved current device owner incorrectly selecting and processing issue when the same device is enrolled to multiple users	2017-05-01 15:48:25 +05:30
warunalakshitha	3938064210	Add opeerations mapping map for tenants and fixes for code review	2017-04-30 14:29:30 +05:30
warunalakshitha	a5759f9818	Add tenant based operation mappings	2017-04-30 13:56:06 +05:30
warunalakshitha	76f8d963f7	Improve push notifications for request with device list less than batch size	2017-04-27 12:23:01 +05:30
warunalakshitha	97a53a7387	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-04-25 19:08:36 +05:30
warunalakshitha	9fa4eedca5	Add Scheduled for push notification sending	2017-04-25 19:07:37 +05:30
warunalakshitha	3c1e4ba205	Add new classes for improve Performance of push notifications	2017-04-25 18:55:31 +05:30
megala21	32ea2e52c4	Fixes https://github.com/wso2/product-iots/issues/373 and https://github.com/wso2/product-iots/issues/370	2017-04-21 15:18:20 +05:30
Harshan Liyanage	9e4d84dfb2	Fix for Advanced Search Issue #670	2017-03-28 12:37:28 +05:30
lakshani	5c7cfda487	Fixed jira IOTS-438	2017-03-24 15:42:54 +05:30
Harshan Liyanage	75486b3bb8	Fixed Device renaming issue.	2017-03-14 13:42:32 +05:30
Susinda	e23aaa6647	Adding Hasunie's fix on initialOperations implementation	2017-03-10 11:54:43 +05:30
Megala	a2d0c59e17	Revert 2988357eb9	2017-03-02 15:18:34 +05:30
Megala	4fdeec89cc	Revert f3f7635d3b	2017-03-02 15:11:59 +05:30
madhawap	f1b761d987	Minor code formating	2017-02-28 21:16:56 +05:30
lakshani	eb12e5b9f1	Adding commit 'added java doc comments'	2017-02-28 21:11:15 +05:30
lakshani	9e5574dccc	Adding commit 'added change device status to device view page'	2017-02-28 21:09:05 +05:30
lakshani	3f90b403c0	Adding lakshani's commit 'updated device status button'	2017-02-28 21:03:53 +05:30
geethkokila	e90dc8b6c1	Fixing the compile error	2017-02-24 12:32:00 +05:30
geethkokila	d8303356cd	Fixing the conflicts	2017-02-24 12:16:14 +05:30
Hasunie	476e439fe2	Fixing the task to get the only device registered tenants	2017-02-14 22:16:55 +05:30
geethkokila	f3f7635d3b	Fixing the task to get the only the device enrolled tenants	2017-02-13 12:34:09 +05:30
geethkokila	275f413652	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-03 16:20:11 +05:30
Milan Perera	a5f41ef734	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud	2017-02-01 12:14:59 +05:30
lakshani	3b32635cf9	removed unwanted new lines	2017-01-30 15:48:15 +05:30
lakshani	bbcdf7aeda	removed unwanted new line	2017-01-30 07:54:43 +05:30
lakshani	26f2e2d2ae	added role query param to getdevices restapis	2017-01-30 07:50:10 +05:30
Milan Perera	2b4a3cde61	Fixed conflicts and merged	2017-01-26 14:59:05 +05:30
Milan Perera	21d8d14b7e	Fixed multy tenancy issues related to android device type	2017-01-26 14:50:12 +05:30
geethkokila	713ddbf416	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-01-26 12:08:10 +05:30
geethkokila	2988357eb9	Changing the task to run for all the tenants	2017-01-26 12:07:29 +05:30
ayyoob	3423ef025d	merged with upstream	2017-01-24 19:39:49 +05:30