829 Commits

Author	SHA1	Message	Date
kamidu	7212e969d8	Fix for SQL query issue in mysql	2016-10-25 17:22:18 +05:30
harshanl	6e1fdabaad	EMM-1342:Added policy revoke operation	2016-10-14 17:13:43 +05:30
harshanl	a89b50197f	EMM-1757:Fixed admin device-detail view issue	2016-10-14 13:21:51 +05:30
harshanl	24c38602b8	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-13 17:11:42 +05:30
harshanl	51910ee67a	EMM-1675:Added policy revoke operation	2016-10-13 17:11:36 +05:30
hasuniea	2128f08658	fixing EMM-1750	2016-10-13 10:00:08 +05:30
Megala	235e9797d4	Fixing EMM-1717	2016-10-10 11:36:25 +05:30
ayyoob	5727886ea1	few changes after apimgt integration	2016-10-09 03:16:02 +05:30
hasuniea	05e95e2675	fix the EMM-1702	2016-10-07 15:48:43 +05:30
harshanl	4ce9c95044	Changed getOperations API to return operation list of removed devices	2016-10-07 12:34:42 +05:30
harshanl	672de3a09e	Device status change fix for iOS	2016-10-03 14:57:46 +05:30
harshanl	399ef2fc06	Windows getOpending operations fix	2016-09-30 15:33:59 +05:30
harshanl	9d31590e83	Windows getPending operations fix	2016-09-30 14:27:11 +05:30
harshanl	10f8b12b88	OperationManagerImpl Code refactored	2016-09-30 11:39:15 +05:30
harshanl	f9ba45f439	Fixed the device status changing issue when there are multiple enrollments for the same device	2016-09-30 11:04:28 +05:30
Rasika Perera	3b68ccb4ba	Merge pull request #365 from rasika/iots-ga ... Merge iot-ga branch	2016-09-29 15:21:17 +05:30
Megala	400199e965	Merge remote-tracking branch 'upstream/master'	2016-09-29 14:18:24 +05:30
Megala	38677f84e8	Fixing SQL syntax problem	2016-09-29 14:09:44 +05:30
Harshan Liyanage	cd06637546	Merge pull request #364 from Megala21/master ... Correcting the problem related with oracle syntax	2016-09-29 14:06:49 +05:30
Megala	12aed521e5	Refactoring code	2016-09-29 13:57:06 +05:30
Megala	2cdaf5aa21	Reverting changes made to generic implementations and moving them to oracle specific ones	2016-09-29 13:44:33 +05:30
Megala	ecc87f370c	Fixing oracle error	2016-09-29 13:19:33 +05:30
Rasika Perera	5c8c28d28c	Merge pull request #1 from warunalakshitha/master ... upgrade product iot to carbon 4.4.9	2016-09-29 11:24:05 +05:30
charitha	e6c4053135	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-29 11:12:52 +05:30
charitha	da0977bd85	Fix SQL error when could happen due to large response payloads	2016-09-29 11:12:28 +05:30
Megala	47d6268c9e	Correcting the problem related with oracle syntax	2016-09-29 01:43:33 +05:30
Megala	cd50fe88bc	Reformatting the code	2016-09-28 16:22:59 +05:30
Megala	82be4ef5a8	Fixing oracle script issues	2016-09-28 15:15:24 +05:30
harshanl	9467efe0f6	Fixed notification issue	2016-09-27 17:54:31 +05:30
harshanl	1a12838b7c	Fixed issue in NotificationDAO due to invalid column name	2016-09-26 17:16:27 +05:30
Rasika Perera	b5b4f508b0	Fixing NPE when fetching opeartion	2016-09-26 14:53:04 +05:30
harshanl	27a9eeb692	Removed unnecessary DM service	2016-09-23 23:22:58 +05:30
harshanl	f24242fb8a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-23 21:17:50 +05:30
harshanl	dd03d0b740	Added device status change upon inactivity mechanism	2016-09-23 21:17:37 +05:30
Ruwan	0c92f80e68	Merge pull request #361 from ruwany/carbon-kernel-4.4.7 ... Migrating kernel/apim/appm/identity to latest versions	2016-09-23 17:04:18 +05:30
Ace	154a6082ce	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 ... # Conflicts: # features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml	2016-09-22 19:08:21 +05:30
harshanl	12713f3301	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-22 10:45:47 +05:30
Rasika Perera	e71d3947cb	Adding intuitive error when specified notification provider is not found	2016-09-22 08:57:34 +05:30
harshanl	108ea98677	Refactor policy mgt components and fixed add operations for invalid devices from task service	2016-09-21 19:44:46 +05:30
harshanl	c967fc34d0	Fixed EMM-1513	2016-09-20 18:43:50 +05:30
Ace	5f90587564	Synching with master	2016-09-20 18:13:53 +05:30
Ace	33d8829540	Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java	2016-09-20 17:02:28 +05:30
harshanl	75df243a33	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-19 12:22:08 +05:30
Ace	6a8a5cbd5a	Merging with master	2016-09-19 12:21:41 +05:30
harshanl	4169d3b2bd	Fixed EMM-1554	2016-09-19 12:08:06 +05:30
dilanua	e4dae67fea	Changing permissions - /devices/any to /devices/any-device	2016-09-17 17:36:06 +05:30
Rasika Perera	d9b25eda08	Adding deviceName into notifications	2016-09-16 09:39:21 +05:30
harshanl	5b0e99aeff	Fixed EMM-1562	2016-09-15 12:37:35 +05:30
harshanl	78cab76101	Fixed EMM-1531	2016-09-15 12:36:55 +05:30
Ace	1dfb8e22e1	Updating to latest appm/apim/identity dependencies	2016-09-14 17:23:09 +05:30