462 Commits

Author	SHA1	Message	Date
NuwanSameera	2d4f07fc55	Add REST Api annotations to Api implementations.	2016-04-19 11:33:31 +05:30
NuwanSameera	50f8716527	Resolve conflicts.	2016-04-11 16:09:23 +05:30
charithag	73d3321154	Fix issues in virtual fire alarm jax-rs api	2016-04-08 16:13:37 +05:30
charithag	6daa5c43c6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-04-07 20:47:37 +05:30
charithag	29486fedd5	Refactoring admin jax-rs to comply with restructured cdm	2016-04-07 20:42:56 +05:30
mharindu	918302475b	Fixed incorrect location coordinate issue (EMM-1313)	2016-04-07 17:28:27 +05:30
mharindu	2548a1dd18	Fix for EMM-1297	2016-04-04 14:21:11 +05:30
charithag	d09aa13497	Refactor group management service	2016-04-01 13:31:07 +05:30
charithag	ecc63f0f0e	Refactor group management service	2016-03-31 17:53:53 +05:30
NuwanSameera	d637325590	Add db scripts to mssql, oracle, postgresql databases.	2016-03-31 17:06:25 +05:30
ayyoob	3488d9d79d	refactored device type implemenation	2016-03-31 04:24:45 +05:30
ayyoob	2778e1c1ef	Merge branch 'master' of https://github.com/NuwanSameera/carbon-device-mgt-plugins into merge-latest	2016-03-30 22:53:48 +05:30
ayyoob	c05191dac5	Added IoT plugins feature and refactored IoT base.	2016-03-30 22:49:20 +05:30
ayyoob	0bf219c93a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-03-30 20:25:26 +05:30
ayyoob	71d2897f20	Added jot plugins features	2016-03-30 20:25:02 +05:30
NuwanSameera	1f0f449385	Modify permissions.xml files in device type.	2016-03-30 17:55:33 +05:30
NuwanSameera	8656f84ac6	Move device type plugins to iot-plugins	2016-03-30 16:14:43 +05:30
inosh-perera	45512be823	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-03-30 16:09:04 +05:30
charithag	53eb49d5ae	Fix bundle imports for java 8	2016-03-30 10:00:25 +05:30
inosh-perera	657cf05ef5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-03-30 09:21:50 +05:30
inosh-perera	56a96cf2c3	addning new features for user restrictions	2016-03-30 09:21:42 +05:30
charithag	8c6690a597	Update MDM admin content from product-emm	2016-03-30 02:10:31 +05:30
charithag	6e981fb2c7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-03-30 01:59:17 +05:30
charithag	f74a8ddf0d	Add device type plugins and features related to emm with IoTS base feature.	2016-03-30 01:57:32 +05:30
charithag	4f5b5188ea	Updated with core changes	2016-03-29 18:32:12 +05:30
mharindu	b74f26975e	Fixed conflicts and merged	2016-03-29 17:29:21 +05:30
charithag	887af1a9f6	Enable IoT base plugin component back and fix isses	2016-03-29 14:22:48 +05:30
charithag	f6d04fba4b	Fix module locations	2016-03-29 12:59:10 +05:30
mharindu	cb9ab9fb0a	Added unlock feature	2016-03-29 11:10:50 +05:30
prabathabey	39d2ce12dc	merging resturctured iot and mobile plugins	2016-03-27 03:02:20 +05:30
gayank	c0a25f08bd	Fixing EMM-1289	2016-03-24 15:31:21 +05:30
geethkokila	64c1772f5b	Changing the plugins snapshit versions to 2.1.0 from 2.0.4	2016-03-24 11:45:41 +05:30
Kamidu Sachith	512bf6c514	Preventing Infromation leakage	2016-01-25 14:42:59 +05:30
WSO2	2a46d2ed98	[maven-release-plugin] prepare for next development iteration	2016-01-07 17:33:06 +05:30
WSO2	e5d15f6616	[maven-release-plugin] prepare release v2.0.3	2016-01-07 17:32:57 +05:30
Kasun Delgolla	99286922dc	Fixing character encoding issues in default licenses.	2016-01-07 15:52:33 +05:30
geethkokila	4eb78d8353	[maven-release-plugin] prepare for next development iteration	2015-12-30 14:39:40 +05:30
geethkokila	937e9af0d8	[maven-release-plugin] prepare release v2.0.2	2015-12-30 14:39:32 +05:30
geethkokila	e0233e9337	[maven-release-plugin] prepare for next development iteration	2015-12-23 23:00:55 +05:30
geethkokila	a3993b09e1	[maven-release-plugin] prepare release v2.0.1	2015-12-23 23:00:46 +05:30
geethkokila	9957ec1022	[maven-release-plugin] rollback the release of carbon-device-mgt-plugins-parent-2.0.1	2015-12-23 22:53:34 +05:30
geethkokila	bf73c3b81d	[maven-release-plugin] prepare for next development iteration	2015-12-23 22:51:14 +05:30
geethkokila	a6788da596	[maven-release-plugin] prepare release carbon-device-mgt-plugins-parent-2.0.1	2015-12-23 22:51:06 +05:30
Prabath Abeysekara	820bd75223	Merge pull request #102 from hasuniea/master ... fixed device enrollment modification	2015-12-23 15:57:33 +05:30
harshanl	618cd1b8fd	Added null checks to GCM service.	2015-12-23 15:30:42 +05:30
hasuniea	9c77c6ae46	fixed device enrollment modification	2015-12-23 15:27:16 +05:30
geethkokila	81e3f53311	[maven-release-plugin] prepare for next development iteration	2015-12-22 08:42:03 +05:30
geethkokila	ab0aa475cc	[maven-release-plugin] prepare release v2.0.0	2015-12-22 08:41:55 +05:30
Kamidu Sachith	9e99e2ec7a	Improve performance of the core	2015-12-21 17:55:04 +05:30
harshanl	fc7776d736	Added null checks for empty regid scenarios as a fix for MDM-396	2015-12-21 17:13:07 +05:30