50 Commits

Author	SHA1	Message	Date
harshanL	80334ef00d	Added new APIs to enrollment	2014-12-11 17:22:32 +05:30
harshanL	dacd16b852	Added validations to json objects in Android-REST apis	2014-12-11 15:48:59 +05:30
harshanL	6d5ea7f586	Added JSON to Device object conversion	2014-12-11 15:21:18 +05:30
Geeth Munasinghe	8cc549d762	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-10 20:01:12 +05:30
Geeth Munasinghe	fd374b16a1	Fixing datasouce configurations	2014-12-10 20:00:12 +05:30
inosh-perera	13b96d9b93	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-10 19:39:55 +05:30
Geeth Munasinghe	3b79c98335	Adding the cdm-datasources.xml to bin xml	2014-12-10 18:47:50 +05:30
Geeth Munasinghe	e1c9856e1e	Adding cdm-datasources.xml	2014-12-10 18:46:02 +05:30
Geeth Munasinghe	14a3429a19	Fixing cdm-config file adding	2014-12-10 18:04:29 +05:30
inosh-perera	ac3bd52260	alert dialogs are invoked from the decleared once in dialog util	2014-12-10 17:59:10 +05:30
prabathabey	5ec8f20baf	adding device management mobile feature into CDM p2-profile	2014-12-10 16:54:11 +05:30
harshanL	efdaf6e7a5	Added parent pom info	2014-12-10 16:41:16 +05:30
harshanL	ac484d06fa	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-10 15:32:39 +05:30
harshanL	963e426e04	added super-tenant flow	2014-12-10 15:31:44 +05:30
Geeth Munasinghe	1deb634f92	Fixing conflicts issue	2014-12-10 15:09:55 +05:30
Geeth Munasinghe	65433dda57	Fixing pom issues	2014-12-10 15:08:31 +05:30
harshanL	7c7768101f	Modified Android enrollment APIs and changed isRegistered to isEnrolled	2014-12-10 14:53:15 +05:30
harshanL	7eb5b960a9	Fixed issues in pom file	2014-12-10 14:11:37 +05:30
harshanL	3f0f4ffeae	Fixed issues in pom file & enrollment	2014-12-10 14:10:04 +05:30
harshanL	267d27745d	Merged changes to master	2014-12-09 20:50:44 +05:30
harshanL	d09b37b4ce	merged changes to master	2014-12-09 20:45:37 +05:30
prabathabey	458171952e	Fixing issues in data types	2014-12-09 20:40:12 +05:30
harshanL	c2f5d79b9c	Added Android-REST API implementation changes	2014-12-09 20:37:47 +05:30
prabathabey	ab6c2717c9	fixing Android API util related issues	2014-12-09 20:32:56 +05:30
Geeth Munasinghe	ef515289cc	Fixing pom issues	2014-12-09 19:57:04 +05:30
Geeth Munasinghe	60f8733c86	Adding the cxf runtime	2014-12-09 19:28:11 +05:30
Geeth Munasinghe	6bc84366f2	Fixing starting problems	2014-12-09 18:53:16 +05:30
harshanL	40a4f54b9f	Android-REST API implementation.	2014-12-09 17:34:37 +05:30
manoj	9c04828935	DAO Layer Implementation ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml	2014-12-08 15:21:32 +05:30
manoj	630c065d4e	DAO Layer Implementation	2014-12-08 15:09:30 +05:30
manoj	23938f5e0b	DAO Layer Impelementation ... Conflicts: pom.xml	2014-12-08 15:06:56 +05:30
inosh-perera	85dffe00bd	removed duplicate files	2014-12-05 14:58:11 +05:30
inosh-perera	8464669a23	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-05 14:46:09 +05:30
inosh-perera	df00f34bb0	andoid registration refactor and jax-rs basic implementation	2014-12-05 14:46:00 +05:30
Geeth Munasinghe	85fc1adc79	Adding featurs for the device mgt	2014-12-05 12:05:48 +05:30
manoj	6e77014e64	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-05 11:11:48 +05:30
manoj	1e6d06027d	DAO Layer Implementation	2014-12-05 11:04:16 +05:30
Geeth Munasinghe	b94d6edfce	Fixing pom name issues of cdm product	2014-12-04 16:51:15 +05:30
Geeth Munasinghe	41d372536d	Fixing bin xml to add bin folder	2014-12-04 11:58:39 +05:30
Niranjan-K	e98fc6c48d	Changed carbon version to 4.3.0-SNAPSHOT	2014-12-03 17:42:16 +05:30
Niranjan-K	546c5627f3	changed pom.version to project.version	2014-12-03 17:27:36 +05:30
Niranjan-K	219968bbfc	Removed carbon.xml, log4j.properties, registry.xml & user-mgt.xml	2014-12-03 17:06:35 +05:30
Niranjan-K	4417db47c9	removed cipher-tool.properties and wso2.emm.jks from pack	2014-12-03 16:55:00 +05:30
Niranjan-K	aec835fc8a	Removed patches from bin.xml	2014-12-03 16:45:36 +05:30
Geeth Munasinghe	e096772907	Removing dependencies from the distribution	2014-12-03 15:37:52 +05:30
Niranjan-K	7898946170	Merge branch 'master' of https://github.com/geethkokila/product-cdm ... Conflicts: pom.xml	2014-12-03 15:34:06 +05:30
Niranjan-K	1ee862ed83	Changed carbon.kernal.version to carbon.kernel.version	2014-12-03 15:30:22 +05:30
inosh-perera	c05bfdbe29	basic db scripts for h2 and mysql	2014-12-03 15:25:36 +05:30
Geeth Munasinghe	afe087b43b	Fixing the licence headers	2014-12-03 14:57:28 +05:30
Geeth Munasinghe	42ab95abdc	Adding product folder and moving modules to that folder	2014-12-03 14:31:13 +05:30