272 Commits

Author	SHA1	Message	Date
prabathabey	8b9cf0da85	Resolving conflicts caused by merging with the updates in master	2016-05-25 17:37:21 +05:30
inosh	1341884957	resolving conflicts	2016-05-23 14:14:05 +05:30
inosh	60b42715d6	syncing admin api from product emm	2016-05-23 14:11:25 +05:30
mharindu	3e291c5b13	[maven-release-plugin] prepare for next development iteration	2016-05-20 16:43:16 +05:30
mharindu	9549ac446b	[maven-release-plugin] prepare release v1.1.0	2016-05-20 16:43:02 +05:30
prabathabey	a375252a94	Adding pluggable push notification framework	2016-05-19 00:20:45 +05:30
Madhawa Perera	94aacb1625	Adding swagger annotations to beans	2016-05-13 02:38:10 +05:30
Madhawa Perera	5d1bf67630	Adding swagger annotations to beans	2016-05-13 01:31:33 +05:30
Madhawa Perera	087adafeb7	Adding swagger annotations to beans	2016-05-13 01:25:29 +05:30
geethkokila	3396a5066d	Adding changes for the updated time of device info and device location	2016-04-29 22:30:07 +05:30
geethkokila	4029c86da4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 10:26:51 +05:30
geethkokila	2fb42518b6	Adding the changes for the device group with policy.	2016-04-27 10:26:47 +05:30
prabathabey	9068a3d893	Fixing compilation failures caused due to API changes	2016-04-26 16:40:30 +05:30
geethkokila	4cf37bb16c	Fixing the compilation error on the proprietory plugins.	2016-04-24 08:54:31 +05:30
dilanua	ce8d4b53a2	Adding temporary development code bits of dashboard analytics feature	2016-04-08 15:10:01 +05:30
ayyoob	c45895685b	Added device type multi tenancy capability.	2016-03-29 11:40:58 +05:30
geethkokila	e9da24c9e8	Changing the snapshot versions from 1.0.4 to 1.1.0	2016-03-24 11:41:52 +05:30
geethkokila	41191d6df0	Adding the search feature to device mgt plugin	2016-03-21 10:33:35 +05:30
geethkokila	e0e0a57c11	[maven-release-plugin] prepare for next development iteration	2016-01-05 18:15:38 +05:30
geethkokila	cebb88e712	[maven-release-plugin] prepare release v1.0.3	2016-01-05 18:15:28 +05:30
geethkokila	e66d291947	[maven-release-plugin] prepare for next development iteration	2015-12-30 14:19:05 +05:30
geethkokila	f416a73e75	[maven-release-plugin] prepare release v1.0.2	2015-12-30 14:18:57 +05:30
geethkokila	d0a2c5521c	Commenting this due to policy compliance warn will block the device	2015-12-24 11:09:32 +05:30
geethkokila	185a59fbd4	[maven-release-plugin] prepare for next development iteration	2015-12-23 22:39:29 +05:30
geethkokila	b3580d754b	[maven-release-plugin] prepare release v1.0.1	2015-12-23 22:39:20 +05:30
harshanl	402b843e5d	Updated task schedule service to fix EMM-1145, EMM-1100	2015-12-23 19:35:50 +05:30
prabathabey	7a27e88551	Changing the log levels configured in log4j.properties files used as part of test configurations	2015-12-22 22:43:26 +05:30
geethkokila	4e9255fbc9	[maven-release-plugin] prepare for next development iteration	2015-12-22 08:28:42 +05:30
geethkokila	ceb60adb34	[maven-release-plugin] prepare release v1.0.0	2015-12-22 08:28:33 +05:30
pasinduj	ddefa19e0f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-12-17 09:41:19 +05:30
Kasun Delgolla	d5f87f4dc1	Committing policy compliance monitoring issue	2015-12-16 14:38:32 +05:30
pasinduj	9a50455a29	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-12-14 08:57:36 +05:30
harshanl	00cf61c44c	Fixed EMM-1069 and refactore DCR services	2015-12-11 20:04:22 +05:30
pasinduj	f49f13501f	modified dbscripts removing policy ID forigen key from one table	2015-12-08 15:35:01 +05:30
pasinduj	a390df68ec	modified dbscripts to remove foriegn key reference	2015-12-08 11:42:04 +05:30
harshanl	5b9c44655d	Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master	2015-12-03 20:20:26 +05:30
harshanl	30e8dc885c	Fixed EMM-1034	2015-12-03 20:13:10 +05:30
pasinduj	9c7ebdafdb	modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference	2015-12-03 18:30:45 +05:30
harshanl	b4d17b888b	fixed secondary user-store related issues & multi-tenancy issues	2015-11-20 00:43:01 +05:30
geethkokila	c1eea6894d	Fixing the feature remove from the policy	2015-11-19 14:45:08 +05:30
geethkokila	271c4f76cb	Fixnig the null pointer isssue	2015-11-16 18:08:21 +05:30
geethkokila	700b308b45	Fixing the null pointer and removnig innactive devices being monitored	2015-11-16 17:44:30 +05:30
geethkokila	1989abf881	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 17:41:37 +05:30
geethkokila	fed4f72d4b	Fixing the null pointer	2015-11-16 17:41:07 +05:30
harshanl	1252d4c160	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 17:21:33 +05:30
geethkokila	0f146e83fa	Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system	2015-11-16 17:17:15 +05:30
geethkokila	813f9072d8	Fixing the database issue which causes the deviceids slelect did not work	2015-11-16 17:15:16 +05:30
Dileesha Rajapakse	6446be100d	Refactored Policy Management DAO classes	2015-11-16 16:49:35 +05:30
Geeth	5fd9e87dc8	Merge pull request #44 from Kamidu/master ... change the formatter	2015-11-10 20:35:58 +05:30
Kamidu Sachith	8953a61cc4	Enable Owneship type editing in policy	2015-11-10 20:17:59 +05:30