5531 Commits

Author	SHA1	Message	Date
mharindu	f7c653b61c	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-04 11:33:37 +05:30
mharindu	9eb2f5df86	Fixed foriegn key violation issue when getting pending operations	2016-06-04 11:33:22 +05:30
madhawap	f80603a365	Fixes to if-modified-since in activity provider	2016-06-03 22:19:40 +05:30
Ace	4609888ad1	Fixes to ifmodified-since in activity provider	2016-06-03 21:03:29 +05:30
ayyoob	23ee3e25e7	updated the timestamp	2016-06-03 19:38:24 +05:30
geethkokila	42ce71da2c	Fixing the spelling mistake	2016-06-03 18:06:33 +05:30
geethkokila	6aea69ae44	Fixing the duplicate issue	2016-06-03 11:40:00 +05:30
geethkokila	efa74030b4	Fixing response duplicate issue	2016-06-03 10:25:22 +05:30
prabathabey	8819c6e36b	Adding support for 'If-Modified-Since' header and 'since' query filter	2016-06-03 04:35:22 +05:30
inoshperera	d71f0c6e6d	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-03 01:46:03 +05:30
inoshperera	037acbe5bb	fixing platform configuration appearing twice issue.	2016-06-03 01:43:21 +05:30
prabathabey	3c21583db6	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-02 23:45:04 +05:30
prabathabey	1a29a9f58f	Further fixing retrieving application list with device info	2016-06-02 23:44:46 +05:30
geethkokila	ae887d6842	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-02 23:10:18 +05:30
geethkokila	a04300b3b6	Fixing the activity Id issue	2016-06-02 23:09:55 +05:30
prabathabey	d3ce96585f	Fixing issues in returning application list in the device response	2016-06-02 22:45:44 +05:30
geethkokila	cc6883d955	Changing the if to a while loop, fixing the activity id issue	2016-06-02 22:26:19 +05:30
prabathabey	67c9ee0e70	Fixing commit conflict	2016-06-02 20:52:26 +05:30
prabathabey	b24250f3f2	Returning device info within the device bean itself	2016-06-02 20:49:23 +05:30
hasuniea	dc72fd1553	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-02 19:01:01 +05:30
hasuniea	e2cebcd430	removed If-Modified-Since header param	2016-06-02 19:00:41 +05:30
inoshperera	ee948abc9d	fixing conflicts and improving swagger annotations and validations	2016-06-02 18:44:26 +05:30
inoshperera	5620e38681	adding proper error messages for APIs	2016-06-02 11:04:33 +05:30
prabathabey	fe22bfc125	Renaming 'recieved' to 'received'	2016-06-02 00:33:14 +05:30
prabathabey	d32cd96a74	Fixing merge conflicts	2016-06-02 00:28:47 +05:30
prabathabey	9ebf705323	Re-enabling retrieval of device info	2016-06-02 00:22:46 +05:30
prabathabey	e002ffb54a	Re-enabling retrieval of device info	2016-06-02 00:20:14 +05:30
dilanua	dada719486	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-01 15:59:14 +05:30
dilanua	0bd2a46690	Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API	2016-06-01 15:58:45 +05:30
ayyoob	aa6298b5e7	updated device management admin api permission	2016-06-01 12:28:10 +05:30
ayyoob	d926bdaa34	removed unused permission from permission.xml	2016-06-01 12:20:18 +05:30
dilanua	07a4a65c7c	Fixing permission issues with GET /devices/*/*/features API	2016-06-01 11:14:17 +05:30
dilanua	25e45dc9f1	Fixing issues in GET /operations and /admin/devices APIs	2016-06-01 10:44:08 +05:30
mharindu	7a029743ba	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-01 02:18:53 +05:30
mharindu	81aa298740	Fixed RoleManagementService API issues	2016-06-01 02:18:15 +05:30
prabathabey	3cb9b5bae2	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-01 01:30:17 +05:30
prabathabey	61beca5048	Fixing getDevice method to support status, ownership, etc as query param filters	2016-06-01 01:30:02 +05:30
ayyoob	9f1de717c5	updated permissions in the permission.xml	2016-06-01 01:23:13 +05:30
mharindu	7aa37ff4d5	Fixed issues in RoleManagementService	2016-06-01 00:31:48 +05:30
mharindu	63ea40eb27	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-01 00:10:36 +05:30
mharindu	ce557266ec	Fixed issues in RoleManagementService	2016-06-01 00:10:30 +05:30
ayyoob	d9c15b62e7	few changes after testing user management api	2016-05-31 23:26:51 +05:30
Prabath Abeysekara	14322d4ba5	Merge pull request #283 from ayyoob/rest-api-improvements ... fixed api issues in policy	2016-05-31 19:16:25 +05:30
ayyoob	5b8b15f69b	fixed api issues in policy	2016-05-31 19:12:58 +05:30
prabathabey	c9a2dc4399	Improving user management API implementation	2016-05-31 19:05:37 +05:30
prabathabey	627d99e913	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-31 18:36:13 +05:30
prabathabey	00a16ea2bc	Improving Role management API implementation	2016-05-31 18:36:00 +05:30
dilanua	4a74ea8100	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-31 18:34:07 +05:30
dilanua	374d509881	Updating DeviceManagementAdminServiceImpl	2016-05-31 18:34:00 +05:30
prabathabey	3e21c6d50d	Improving ceritificate management webapp impl	2016-05-31 17:49:26 +05:30
Ace	ddfd678b2a	Adding user management API bug fixes and improvements	2016-05-31 17:26:20 +05:30
Ace	d13368d144	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-31 17:17:20 +05:30
Ace	bfe215deac	Adding changes and bug fixes to UserMgtService	2016-05-31 17:13:11 +05:30
Milan Perera	289fef040b	Merge pull request #282 from ayyoob/rest-api-improvements ... Rest api improvements in password reset	2016-05-31 17:13:11 +05:30
ayyoob	d63e5e876b	added password validation error msg	2016-05-31 17:09:34 +05:30
mharindu	cfe24229fc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-31 16:19:03 +05:30
prabathabey	1d4d0b7ae2	Improving certificate management webapp implementation	2016-05-31 16:13:45 +05:30
ayyoob	74a96015a7	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-31 13:57:54 +05:30
ayyoob	cf1e808cbd	refactored after testing UserAdminManangmentService	2016-05-31 13:57:38 +05:30
hasuniea	dfc673b08f	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-31 13:13:32 +05:30
hasuniea	1443c7757e	fixing code issues	2016-05-31 13:13:01 +05:30
prabathabey	9f48145614	Improving device admin service impl	2016-05-31 13:12:57 +05:30
prabathabey	697c727801	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-31 13:00:26 +05:30
prabathabey	fc3d6cccbf	Fixing Issues in notification management APIs	2016-05-31 12:49:51 +05:30
hasuniea	57d445237a	add certificateMgtService	2016-05-31 12:48:26 +05:30
charitha	92a732cd41	Moved redundant texts to constants	2016-05-31 11:30:36 +05:30
geethkokila	3defcfe20d	Fixing the applicationMgtAdminService for returing activity	2016-05-31 11:25:11 +05:30
charitha	e2c03adec4	FIx for https://wso2.org/jira/browse/IOTS-169	2016-05-31 11:14:37 +05:30
prabathabey	fbf213f77c	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-30 17:47:14 +05:30
prabathabey	20fd2ec768	Improving application installation/uninstallation handling	2016-05-30 17:46:37 +05:30
hasuniea	9c3c08b4ca	fix UnAuthorizedDeviceAccessException.java	2016-05-30 17:15:21 +05:30
prabathabey	af58e5ec88	Code cleanup	2016-05-30 16:42:10 +05:30
prabathabey	5ed982beb4	Adding more improvements to the JAX-RS APIs of CDM-F	2016-05-30 16:40:57 +05:30
prabathabey	fd7a137b07	Improving jax-rs APIS of CDM-F	2016-05-30 13:39:52 +05:30
hasuniea	20343d9349	fixed swagger message issue	2016-05-30 13:03:21 +05:30
prabathabey	726a700528	Improving error handling in checking for monitoring frquency	2016-05-30 11:45:02 +05:30
prabathabey	6e5148a374	Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services	2016-05-30 08:21:59 +05:30
mharindu	71eb657e52	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-28 21:05:09 +05:30
prabathabey	54f9d02ebb	Code cleanup	2016-05-28 11:10:22 +05:30
prabathabey	77d4c167af	code cleanup	2016-05-28 08:31:20 +05:30
geethkokila	b7da99a621	Adding activity apis to get the updated once after a given time	2016-05-28 08:25:27 +05:30
prabathabey	2925f52cd8	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-28 08:12:19 +05:30
prabathabey	6d50ba14b1	Code cleanup	2016-05-28 08:11:51 +05:30
inoshperera	db3dc0517b	adding activity status related details.	2016-05-28 07:48:45 +05:30
prabathabey	e1dfecb518	Changing the value of If-Modified-Since header as a string	2016-05-28 06:41:26 +05:30
prabathabey	76ec7bdc28	Improving swagger metada	2016-05-28 06:03:47 +05:30
prabathabey	425c0e7498	Improving swagger annotations of CDM-F core APIs further	2016-05-28 04:52:00 +05:30
geethkokila	ed0da9e1d0	Fixing the device informations to get the applications	2016-05-28 03:12:10 +05:30
prabathabey	95458ce9b0	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-28 02:04:31 +05:30
prabathabey	d92fb53dc9	Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do	2016-05-28 02:04:02 +05:30
geethkokila	ecc8b5e6f2	Fixing the api issues	2016-05-28 02:02:43 +05:30
geethkokila	0221782533	Adding new apis for getting the device location when list of device identifiers are supplied	2016-05-28 01:57:36 +05:30
geethkokila	62c84319d8	Fixing the device search for application list	2016-05-28 01:15:52 +05:30
prabathabey	88cab5abf5	Fixing commit conflicts	2016-05-28 01:01:47 +05:30
prabathabey	37aa05f79c	Committing improved swagger annotated cdm-f APIs	2016-05-28 00:55:25 +05:30
dilanua	f4f47cbfdd	Changing view names to fix oracle naming issues in dashboard analytics feature	2016-05-28 00:41:21 +05:30
geethkokila	6328d35797	Changing the device info object by adding the application list	2016-05-28 00:19:04 +05:30
inoshperera	3c73217e96	fixing osgi issue related to usage of carbon context. And adding api publishing check from config.	2016-05-27 19:15:46 +05:30
inoshperera	1ffbb2183a	adding permissions for DM services	2016-05-27 14:20:10 +05:30
prabathabey	0b9c64594c	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-27 12:29:01 +05:30
prabathabey	32cb32b706	modifying the name of the device management admin api war	2016-05-27 12:28:48 +05:30
inoshperera	4623fa2269	swagger annotations added to APIs	2016-05-27 11:55:58 +05:30
prabathabey	30f6fc53b5	Merging the latest changes introduced in master	2016-05-27 11:44:58 +05:30
prabathabey	ebefd60533	Renaming TenantConfiguration as PlatformConfiguration	2016-05-27 11:22:54 +05:30
ayyoob	e8b9f03748	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-27 01:27:32 +05:30
Milan Perera	4462c353b4	Merge pull request #277 from ayyoob/transport ... Fixed https://wso2.org/jira/browse/IOTS-177	2016-05-26 21:21:06 +05:30
geethkokila	86e564713d	Adding the changes for getting activity ids which are changes after a certain time	2016-05-26 21:16:01 +05:30
geethkokila	01e3cc4987	Fixing the activity related issues	2016-05-26 18:44:12 +05:30
prabathabey	6d33d7036b	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-26 18:02:12 +05:30
prabathabey	0f5cf86d04	Adding the base path to be included in the swagger docs and appending the proper version to the webapp name	2016-05-26 18:00:45 +05:30
ayyoob	5532db6dd4	Fixed https://wso2.org/jira/browse/IOTS-177	2016-05-26 17:10:37 +05:30
inoshperera	aeec472805	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-05-26 12:53:20 +05:30
inoshperera	2959c05e1a	adding swagger annotations for device and activity APIs.	2016-05-26 12:52:49 +05:30
mharindu	52388ed33d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-26 12:44:36 +05:30
mharindu	106be76118	Fixed issues of API publishing to gateway	2016-05-26 12:41:20 +05:30
prabathabey	7e8f38cf16	Fixing conflicts while merging the latest changes in master	2016-05-25 17:59:12 +05:30
prabathabey	e7bf0c7658	Resolving conflicts caused by merging with the updates in master	2016-05-25 17:45:37 +05:30
prabathabey	8b9cf0da85	Resolving conflicts caused by merging with the updates in master	2016-05-25 17:37:21 +05:30
prabathabey	29b3b965b0	Making all CDM-F REST APIs compatible with the REST API specifications	2016-05-25 16:26:29 +05:30
Milan Perera	67e5a5a23a	Merge pull request #275 from GPrathap/master ... added a bundleDef :net.minidev:json-smart	2016-05-25 14:56:36 +05:30
GPrathap	78475963e3	added entry for websocket url	2016-05-25 14:38:46 +05:30
inoshperera	deb4195f7a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-25 13:54:42 +05:30
inoshperera	a40e44899a	syncing REST apis of core and product EMM	2016-05-25 12:38:24 +05:30
Ruwan	98f8ace1ff	Merge pull request #274 from rasika90/master ... Adding licence headers for server-side handlebar templates	2016-05-25 11:45:12 +05:30
geethkokila	c64a6e0ec5	Changing apis to return activity when an operation is added	2016-05-25 11:42:44 +05:30
Rasika Perera	d7f4a39075	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-25 11:34:51 +05:30
Rasika Perera	b879927dc1	Adding licence headers for handlebar templates	2016-05-25 11:28:24 +05:30
geethkokila	afba711969	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-25 08:16:14 +05:30
dilanua	339512e287	Updating comments in dashboard analytics feature	2016-05-24 18:26:47 +05:30
inoshperera	d7fe6d5e96	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-24 17:46:17 +05:30
dilanua	4663d78060	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-23 17:14:52 +05:30
dilanua	47e17e4a51	Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature	2016-05-23 17:14:29 +05:30
mharindu	50d35a90f8	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-23 16:51:38 +05:30
mharindu	66ccad65cf	Partial commit for APIM Gateway migration	2016-05-23 16:51:26 +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
geethkokila	16b809b255	Fixing the conflicts	2016-05-23 11:21:48 +05:30
geethkokila	1697a7ce85	Doing a partial commit for syncing the code base	2016-05-23 11:19:37 +05:30
geethkokila	ba25ecc6ef	Doing a partial commit for syncing the code base	2016-05-23 11:19:22 +05:30
Prabath Abeysekara	830b3fc075	Merge pull request #272 from wso2/release-1.1.0 ... Release 1.1.0 and upgrading the versions	2016-05-23 10:08:13 +05:30
dilanua	8c4752ede3	Adding more comments to dashboard analytics data service interface	2016-05-22 16:54:07 +05:30
dilanua	975a3b915f	Properly layering beans and custom exceptions in dashboard analytics feature	2016-05-22 08:12:25 +05:30
dilanua	a7c7452e2e	Adding final updates to dashboard analytics feature	2016-05-20 17:10:37 +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
mharindu	65612f724f	Fixed compile issue	2016-05-20 16:02:56 +05:30
prabathabey	9ec80bfe18	Fixing build failures caused by changed introduced to Operation Management APIs	2016-05-20 12:43:47 +05:30
dilanua	b9a9fb3169	Adding class & method comments, constants to dashboard analytics feature	2016-05-19 12:37:12 +05:30
Ace	ecd386adf0	Fixing IOTS-160	2016-05-19 08:22:29 +05:30
mharindu	968cb00f35	Fixed conflicts and merged	2016-05-19 00:42:14 +05:30
mharindu	83c2a1f0ee	Fixed issues in api publishing	2016-05-19 00:30:41 +05:30
prabathabey	5e03c5ed30	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-19 00:20:57 +05:30
prabathabey	a375252a94	Adding pluggable push notification framework	2016-05-19 00:20:45 +05:30
sumedharubasinghe	067f0a8050	Merge pull request #266 from ayyoob/transport ... added api application registration filter	2016-05-18 23:17:43 +05:30
mharindu	bca1b4b059	Fixed conflicts	2016-05-18 22:01:38 +05:30
mharindu	9f93570b29	Fixed issues in webapp-publisher	2016-05-18 22:00:16 +05:30
ayyoob	ba47af3186	added api application registration filter	2016-05-18 19:33:04 +05:30
dilanua	7051af8d80	Adding relevant contextual names for database view names in dashboard analytics feature	2016-05-18 18:48:43 +05:30
geethkokila	958288f8ec	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-18 14:57:01 +05:30
geethkokila	c7dd386c94	Adding new apis for device informations	2016-05-18 14:56:46 +05:30
dilanua	2886ead44b	Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature	2016-05-18 14:26:43 +05:30
mharindu	49cb4787c0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-18 11:49:35 +05:30
mharindu	82b90522a0	Migrated to APIM 5.0.4	2016-05-18 11:49:20 +05:30
sumedharubasinghe	61ef87c658	Merge pull request #265 from rasika90/IOTS-114 ... Fixing IOTS-114: the user is unable to deselect a child node permissions	2016-05-18 11:26:18 +05:30
Rasika Perera	bc3f64a77a	Fixing IOTS-114: the user is unable to deselect a child node permissions	2016-05-18 11:24:38 +05:30
charitha	075b5a8901	Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164	2016-05-18 10:10:21 +05:30
sumedharubasinghe	6a69a3a895	Merge pull request #261 from charithag/master ... Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158	2016-05-18 02:20:00 +05:30
sumedharubasinghe	2f6c1dfbdd	Merge pull request #263 from ayyoob/transport ... few fixes in JWT client after testing with multi tenancy	2016-05-18 02:18:33 +05:30
ayyoob	c0240c5cbc	few fixes in JWT client after testing with multi tenancy	2016-05-18 02:09:12 +05:30
charitha	aadf87e5d9	Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158	2016-05-17 23:33:33 +05:30
Rasika Perera	be970bfc9d	Fixing IOTS-117 Domain needs to be marked as a mandatory field	2016-05-17 23:05:32 +05:30
mharindu	89026c2b7f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-17 20:33:23 +05:30
charitha	6dc0a9dd38	Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario	2016-05-17 18:40:39 +05:30
mharindu	9ebf2ab6d9	Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt	2016-05-17 15:33:17 +05:30
charitha	ddc47cd862	Fix for https://wso2.org/jira/browse/IOTS-161	2016-05-17 14:25:28 +05:30
charitha	0ccaa9fe81	Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112	2016-05-17 13:57:47 +05:30
mharindu	5ccc480ddb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-17 12:25:57 +05:30
dilanua	d5950afe7a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-17 05:55:05 +05:30
dilanua	c90f4471a8	Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature	2016-05-17 05:54:40 +05:30
charitha	9480c71522	Fixed script error	2016-05-16 21:57:48 +05:30
charitha	e0fc7c4018	Fix for https://wso2.org/jira/browse/IOTS-110	2016-05-16 21:01:33 +05:30
charitha	81524ae32c	Fix for https://wso2.org/jira/browse/IOTS-156	2016-05-16 18:37:49 +05:30
charitha	3d9ae8d1f6	Fix for https://wso2.org/jira/browse/IOTS-152	2016-05-16 17:50:58 +05:30
charitha	e7c5ef78d0	Removed unnecessary jaggery apis	2016-05-16 17:03:36 +05:30
mharindu	b77f5358e8	Removed external dependancies from webapp publisher component	2016-05-16 14:23:52 +05:30
mharindu	83ec18c38d	Removed external dependancies from webapp publisher component	2016-05-16 14:20:34 +05:30
mharindu	c68b92c7b4	Fixed conflicts	2016-05-16 14:12:28 +05:30
mharindu	9a4b904702	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-16 11:55:35 +05:30
Ruwan	8f0840e3df	Merge pull request #254 from ayyoob/transport ... updated authentication in api	2016-05-15 20:07:02 +05:30
ayyoob	168033b19d	updated authentication in api	2016-05-15 17:46:13 +05:30
charitha	685c52a453	Bug fixes	2016-05-15 13:13:30 +05:30
Ace	cbc505c459	changing profile name	2016-05-15 01:35:57 +05:30
Ace	4517a7f1aa	Making API publish destination configurable and other changes	2016-05-15 01:15:11 +05:30
Ace	6d9f2f92a4	Making API publish destination configurable	2016-05-15 01:12:45 +05:30
ayyoob	b3075cf1bc	removing application related roles	2016-05-14 00:10:39 +05:30
ayyoob	51d46213c2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport	2016-05-13 15:03:11 +05:30
charitha	973e1ce40f	Fix issues in group api	2016-05-13 13:52:35 +05:30
charitha	0a838923cb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Group.java	2016-05-13 12:43:53 +05:30
Madhawa Perera	43648e4692	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-13 08:07:44 +05:30
Madhawa Perera	b5741b420c	Adding swagger annotations to beans	2016-05-13 08:07:28 +05:30
prabathabey	71180e686e	Improving swagger annotations	2016-05-13 07:39:09 +05:30
prabathabey	a0dbb25824	Fixing code conflicts and improving swagger annotations	2016-05-13 07:12:03 +05:30
Madhawa Perera	e75afb8020	Adding swagger annotations to beans	2016-05-13 07:07:55 +05:30
ayyoob	48912a05bb	merged with upstream	2016-05-13 05:23:19 +05:30
prabathabey	9e4b4d2205	Improving swagger annotations	2016-05-13 04:02:42 +05:30
ayyoob	bee9a106cc	removed method and type from feature	2016-05-13 02:53:08 +05:30
inoshperera	50b5661a74	Merge pull request #245 from madhawap/master ... Added swagger annotations to beans	2016-05-13 01:57:46 +05:30
Madhawa Perera	fca80273bc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-13 01:39:43 +05:30
inosh-perera	b2383617e1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-13 01:30:22 +05:30
inosh-perera	0cf0ec6e77	adding swagger annotations to APIs	2016-05-13 01:30:17 +05:30
Madhawa Perera	6227e93d2f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-13 01:25:44 +05:30
Madhawa Perera	087adafeb7	Adding swagger annotations to beans	2016-05-13 01:25:29 +05:30
geethkokila	ccea046240	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-13 01:10:10 +05:30
geethkokila	4e4e660fa1	Adding the swagger documentation to the activity id resource	2016-05-13 01:09:56 +05:30
Madhawa Perera	26c10f84ec	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-13 00:34:54 +05:30
Madhawa Perera	66c12a8b1c	Adding swagger annotations to beans	2016-05-13 00:34:38 +05:30
geethkokila	3bec779e0b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-13 00:27:27 +05:30
geethkokila	362cf40d85	Fixing the operation activity id issues	2016-05-13 00:25:13 +05:30
inosh-perera	797c7a02d0	adding swagger annotation to beans	2016-05-13 00:24:59 +05:30
Madhawa	07c5362104	Adding swagger annotations to beans and some modifications to api interfaces	2016-05-12 23:11:23 +05:30
mharindu	ed1eb217ea	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-12 23:03:15 +05:30
inosh-perera	c945d63038	fixing issues in swagger dependancy	2016-05-12 23:01:21 +05:30
Madhawa	85f485df4c	Few changes to interfaces with swagger annotations	2016-05-12 22:19:17 +05:30
Madhawa	b6e7827920	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-12 22:12:35 +05:30
Madhawa	fffc7f3205	Adding swagger annotations to beans	2016-05-12 22:12:23 +05:30
Hasunie	17f3a10ec4	Merge pull request #243 from hasuniea/master ... added annotation for ConfigurationEntry	2016-05-12 22:04:56 +05:30
ayyoob	ec7727e8bf	removed method and type from features	2016-05-12 22:01:48 +05:30
mharindu	fd39b31369	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-12 22:00:24 +05:30
mharindu	1f21144668	Renamed EMM permission to CDMF	2016-05-12 22:00:15 +05:30
hasuniea	e633d28013	added annotation for ConfigurationEntry	2016-05-12 22:00:09 +05:30
Madhawa	ae13f7f889	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-12 21:58:34 +05:30
Madhawa	707da02c7e	Adding swagger annotations to beans	2016-05-12 21:58:23 +05:30
Kasun Delgolla	da1a60615c	Merge pull request #239 from charithag/master ... Fixed https://wso2.org/jira/browse/IOTS-104	2016-05-12 21:49:13 +05:30
hasuniea	e4dfe63548	code conflicts	2016-05-12 21:15:53 +05:30
hasuniea	1267db52ce	added swagger annotations for TenantConfiguration	2016-05-12 21:11:51 +05:30
Milan Perera	fb9c824e40	Merge pull request #241 from ayyoob/transport ... Few fixes after testing	2016-05-12 20:26:56 +05:30
inoshperera	97db3e42d6	Merge pull request #242 from madhawap/master ... Added swagger annotations to the interfaces	2016-05-12 20:24:42 +05:30
inosh-perera	5597c752ac	Adding sawgger annotations to admin Jax-rs apis.	2016-05-12 20:17:20 +05:30
Madhawa	b407797ab0	added swagger annotation to the interfaces	2016-05-12 20:16:52 +05:30
ayyoob	34f1f4dfe2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport	2016-05-12 13:41:08 +05:30
Madhawa	36c3a057dc	created interfaces for the api classes in order add swagger definitions	2016-05-12 11:25:20 +05:30
Madhawa	f5915cbf5d	created interfaces for the api classes in order add swagger definitions	2016-05-12 10:32:49 +05:30
Madhawa	46e0c4ea8b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Created interfaces for the api classes in order to add swagger definitions.	2016-05-12 09:52:33 +05:30
Madhawa	7b04d9f0b0	created interfaces for the api classes in order add swagger definitions	2016-05-12 09:51:43 +05:30
ayyoob	ac587c3353	fixes after testing	2016-05-12 02:42:29 +05:30
dilanua	bb3bcdfd2d	Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature	2016-05-11 20:01:02 +05:30
charitha	18957b0110	Add required jagerry modules for the app	2016-05-11 19:30:55 +05:30
charitha	0c8f1ce770	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-11 16:54:06 +05:30
charitha	73222e347b	Fixed https://wso2.org/jira/browse/IOTS-104	2016-05-11 15:59:35 +05:30
dilanua	14c07846b2	Adding mssql support to dashboard analytics feature	2016-05-11 14:21:13 +05:30
prabathabey	285c870d6a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-11 12:40:28 +05:30
prabathabey	bc894f2517	Adding Swagger-annotation dependency to carbon-device-mgt	2016-05-11 12:38:15 +05:30
mharindu	b58e2b13c6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-11 10:50:46 +05:30
mharindu	5ad8d2938e	Fixed issues of publishing APIs to synapse gateway	2016-05-11 10:50:32 +05:30
Ruwan	93b1d618b6	Merge pull request #237 from charithag/master ... Enable group analytics	2016-05-10 21:45:39 +05:30
charitha	576a7d83ad	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-10 21:33:46 +05:30
charitha	7ff993a7b7	Enable group analytics	2016-05-10 21:31:51 +05:30
dilanua	4cabe359a0	Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature	2016-05-10 18:53:41 +05:30
dilanua	0534cd0a7e	Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature	2016-05-10 18:52:44 +05:30
dilanua	adec59e934	Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature	2016-05-10 15:26:20 +05:30
dilanua	2a9e2a47e8	Adding inter-mediate code improvements to dashboard analytics feature	2016-05-10 07:26:49 +05:30
dilanua	0ab4035b37	Adding H2, MySQL Support for dashboard analytics feature	2016-05-09 12:33:11 +05:30
dilanua	a23e578537	Adding inter-mediate development code bits for dashboard analytics feature	2016-05-08 17:43:05 +05:30
dilanua	17e958d838	Adding inter-mediate development code bits for dashboard analytics feature	2016-05-08 17:42:01 +05:30
dilanua	7b43d28298	Adding temporary development code bits for dashboard analytics feature	2016-05-06 12:54:04 +05:30
dilanua	d568c6e8bd	Adding temporary development code bits for dashboard analytics feature	2016-05-05 16:12:15 +05:30
dilanua	945e188917	Adding temporary development code bits for dashboard analytics feature	2016-05-05 12:03:11 +05:30
dilanua	82ffcb012b	Adding temporary development code bits for dashboard analytics feature	2016-05-05 11:51:31 +05:30
dilanua	9786908b35	Adding temporary development code bits for dashboard analytics feature	2016-05-05 11:49:09 +05:30
Rasika Perera	18edc21a04	Adding group permissions validation for operations	2016-05-04 04:14:09 +05:30
Rasika Perera	5c680b3f65	Fixing issue on group permission validating	2016-05-04 04:13:39 +05:30
sumedharubasinghe	d7064c9230	Merge pull request #233 from ayyoob/das-ext ... removed unused code	2016-05-04 03:14:35 +05:30
Charitha Goonetilleke	ca62c2ef73	Fix grouped device listing	2016-05-04 02:47:45 +05:30
Charitha Goonetilleke	e01b62086f	Fix parameter mismatch	2016-05-04 01:47:50 +05:30
ayyoob	442f8c38fe	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext	2016-05-04 01:20:18 +05:30
ayyoob	5f302fce63	removed unused code and resolved host issues	2016-05-04 01:19:56 +05:30
Charitha Goonetilleke	8c62d9d64c	Add authorization check for shared devices in groups	2016-05-04 00:07:48 +05:30
Charitha Goonetilleke	92784120bd	Add group sharing UI functionality	2016-05-03 23:28:26 +05:30
Charitha Goonetilleke	d15e52491a	Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt	2016-05-03 19:57:36 +05:30
Rasika Perera	33eed1f6cd	Adding permissions for roles updating	2016-05-03 19:52:52 +05:30
Rasika Perera	b6c33a0aec	Fixing group roles listing	2016-05-03 19:49:09 +05:30
Charitha Goonetilleke	b705352fb7	Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt	2016-05-03 19:32:05 +05:30
Charitha Goonetilleke	f74a5b7a59	Merge remote-tracking branch 'rasika/master'	2016-05-03 19:31:31 +05:30
Rasika Perera	938eda7c46	Adding group permissions checking	2016-05-03 19:29:12 +05:30
Rasika Perera	9cb24d8cec	Adding enum to hold default role to default permissions mapping	2016-05-03 19:18:58 +05:30
Rasika Perera	142ab10eea	Code refactoring	2016-05-03 19:18:07 +05:30
Rasika Perera	64a262d3e4	Fixing 404 on groups listing	2016-05-03 15:34:50 +05:30
Rasika Perera	4eb588ac60	Group Constants moved to common	2016-05-03 14:37:34 +05:30
geethkokila	d32e822055	Fixing the shutdown errors	2016-05-03 14:10:30 +05:30
Rasika Perera	38cdd94f3c	Adding group permission checking for Device Access Authorizations	2016-05-03 00:33:19 +05:30
dilanua	af973dacc6	Adding temporary development code bits for dashboard analytics feature	2016-05-02 18:45:23 +05:30
Rasika Perera	07c0aa1045	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-02 18:12:03 +05:30
dilanua	d9015b92a0	Adding temporary development code bits for dashboard analytics feature	2016-05-02 15:27:32 +05:30
dilanua	c828a5264b	Adding temporary development code bits for dashboard analytics feature	2016-05-02 15:15:45 +05:30
geethkokila	a0d260e6a3	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-02 14:36:52 +05:30
geethkokila	e2d67fc92c	Adding the changes for device search	2016-05-02 14:36:14 +05:30
Kasun Delgolla	d1def26602	Committing group listing back end pagination UI	2016-05-02 12:56:22 +05:30
dilanua	f2f153a2b4	Adding temporary development code bits for dashboard analytics feature	2016-05-01 09:51:09 +05:30
geethkokila	f2128762f0	Adding the changes for removing repeated operations from pending operations, if same operation is added twice, are making them repeated, Device will not recieve them	2016-04-30 19:37:23 +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	d4f2a95972	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-29 17:35:13 +05:30
charithag	fd531555a3	Fix bugs	2016-04-29 13:34:46 +05:30
charithag	a2cb6937c1	Fix device listing page title	2016-04-29 12:46:53 +05:30
charithag	68361f01ed	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-29 12:30:00 +05:30
geethkokila	aa3e7a9eda	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-29 11:03:18 +05:30
dilanua	b8972c9019	Adding temporary development code bits for dashboard analytics feature	2016-04-29 05:40:34 +05:30
geethkokila	3dd830c7d0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-28 19:53:56 +05:30
geethkokila	6f9851413e	Adding the changes for operation activity id	2016-04-28 19:53:42 +05:30
dilanua	330e1a1e19	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-28 18:11:44 +05:30
dilanua	46117b4e84	Adding temporary development code bits for dashboard analytics feature	2016-04-28 18:10:52 +05:30
mharindu	548f71ca2e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-28 16:43:24 +05:30
dilanua	49513ba79b	Adding temporary development code bits for dashboard analytics feature	2016-04-28 14:26:22 +05:30
dilanua	b9be51d50d	Adding temporary development code bits for dashboard analytics feature	2016-04-28 12:18:43 +05:30
mharindu	6f8bb64e1c	Fixed merge conflicts	2016-04-28 11:59:03 +05:30
mharindu	ffc7542d4d	Modified authorization to support API gateway	2016-04-28 11:36:34 +05:30
charithag	25ea00f26f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-28 08:02:55 +05:30
charithag	b1683c1ccb	Add capability to assign device in to a group and bug fixes	2016-04-28 08:01:46 +05:30
dilanua	053d14b317	Adding temporary development code bits for dashboard analytics feature	2016-04-28 06:28:13 +05:30
Ace	a06327b731	refactoring and bug fixes	2016-04-27 20:43:13 +05:30
geethkokila	5a77e08fd5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 17:57:05 +05:30
charithag	6e84f0a5a3	Fix font issue	2016-04-27 16:37:05 +05:30
charithag	2a006684cc	Fix formatting	2016-04-27 16:07:14 +05:30
charithag	fb52c5845d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 15:41:41 +05:30
charithag	bcbde92143	Update new analytics components.	2016-04-27 15:40:49 +05:30
dilanua	2a55c50ad1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 13:58:58 +05:30
dilanua	2b62eac4f5	Adding temporary development code bits for dashboard analytics feature	2016-04-27 13:58:53 +05:30
charithag	1e709bc394	Update new analytics components and remove obsoletes.	2016-04-27 13:43:37 +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
charithag	f6281c8ef0	Add jax-rs endpoints to modify and remove devices. ... Update clientside js to work with secured apis	2016-04-26 20:50:39 +05:30
Charitha Goonetilleke	15a6e4b63b	Fix formatting issues	2016-04-26 19:54:19 +05:30
charithag	d8a9b642ff	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-26 18:57:25 +05:30
charithag	42d11b9d78	Add tenant aware dynamic units routing	2016-04-26 18:56:41 +05:30
prabathabey	52b81dd3eb	Fixing compilation failures	2016-04-26 17:38:16 +05:30
prabathabey	f5f177a858	Wrapping all device provisioning related info in ProvisioningConfig	2016-04-26 17:16:48 +05:30
Prabath Abeysekara	6ddd5db8cc	Merge pull request #221 from ayyoob/das-ext ... Added device type specific graph loader	2016-04-26 16:35:43 +05:30
prabathabey	2133762792	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-26 15:59:34 +05:30
prabathabey	95d3b97c5f	Code cleanup	2016-04-26 15:59:22 +05:30
ayyoob	e0f47cba19	Added device type specific graph loader	2016-04-26 15:58:21 +05:30
charithag	6d5635465e	Add missing UI functionalities	2016-04-26 15:49:44 +05:30
Ruwan	f04705dda5	Merge pull request #213 from charithag/patch-1 ... Fix formatting	2016-04-26 11:45:29 +05:30
charithag	61b43ce5d8	Rename packages in device mgt jax-rs apis	2016-04-26 11:42:51 +05:30
Rasika Perera	22031c476c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-26 11:36:03 +05:30
charithag	646d87968c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-25 22:37:34 +05:30
charithag	dfb7e9a9c8	Fix permissions	2016-04-25 22:36:41 +05:30
prabathabey	aef892fece	Code cleanup	2016-04-25 21:08:14 +05:30
prabathabey	a10a693507	Fixing find bugs reported issues	2016-04-25 21:07:57 +05:30
prabathabey	f2ba20baeb	Code cleanup	2016-04-25 20:42:10 +05:30
prabathabey	47572d08f5	Removing obsolete dependencies to ApplicationManager interface from DeviceManagementService SPI	2016-04-25 20:29:11 +05:30
Rasika Perera	480d6d5b7e	Remove redundant log messages	2016-04-25 19:41:04 +05:30
dilanua	7027a3553a	Adding temporary development code bits for dashboard analytics feature	2016-04-24 08:24:43 +05:30
dilanua	2f2e8f391a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-23 22:52:25 +05:30
dilanua	c3bc22519a	Adding temporary development code bits for dashboard analytics feature	2016-04-23 22:51:58 +05:30
ayyoob	5e1ad22480	few changes on download api	2016-04-23 20:30:14 +05:30
ayyoob	9f98f538de	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext	2016-04-22 20:59:23 +05:30
ayyoob	b99d10e075	few changes invoker util to support file downloading	2016-04-22 20:57:22 +05:30
dilanua	274aa0ecd3	Adding temporary development code bits for cdmf-product dashboard feature	2016-04-22 10:48:42 +05:30
dilanua	a888cf39c0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-21 13:32:58 +05:30
Ruwan	c6fbc8f1fe	Merge pull request #216 from GPrathap/master ... fixed some bugs which caused while enabling SSO in IoT Server	2016-04-20 23:48:48 +05:30
GPrathap	84492d70ac	added constants for authentications types	2016-04-20 22:10:04 +05:30
GPrathap	55a95cca86	bug fixes	2016-04-20 22:08:30 +05:30
Rasika Perera	8e7052e012	adding JSON strigify on payload if contentType is json	2016-04-20 22:03:01 +05:30
Rasika Perera	69e38b3c98	adding JSON strigify on payload if contentType is json	2016-04-20 22:02:31 +05:30
Rasika Perera	6ec5b7a85a	Reading Http Method from Features	2016-04-20 13:42:25 +05:30
Rasika Perera	2d44ec234b	Now operations are auto generated and supports query params, path params and form params.	2016-04-20 13:38:36 +05:30
Rasika Perera	bb33b4ea12	Parameterizing Content-Type and Accept headers.	2016-04-20 13:37:42 +05:30
charithag	a5a1529853	Fix issues in device listing page and device details page	2016-04-19 14:54:37 +05:30
Charitha Goonetilleke	05858da548	Fix formatting	2016-04-18 18:31:15 +05:30
charithag	c0e4c6b461	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-18 17:59:59 +05:30
charithag	6d8c3e5315	Fix default permission issues	2016-04-18 16:44:03 +05:30
charithag	516155dae5	Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins	2016-04-18 16:39:35 +05:30
ayyoob	afe965e787	adding code review changes on JWT and API App registration	2016-04-14 19:55:55 +05:30
dilanua	3daa42ca5d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-11 12:10:21 +05:30
charithag	ab4b61401c	Fixing UI and implementation issues occurred after restructuring.	2016-04-08 16:19:15 +05:30
charithag	4a72c789f2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-08 16:14:17 +05:30
charithag	0133cddc68	Fixing UI and implementation issues occurred after restructuring.	2016-04-08 16:12:37 +05:30
dilanua	c7af1a1e23	Adding temporary development code bits of dashboard analytics feature	2016-04-08 15:22:36 +05:30
dilanua	ce8d4b53a2	Adding temporary development code bits of dashboard analytics feature	2016-04-08 15:10:01 +05:30
Lakshman	993a387e7c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-08 11:26:58 +05:30
charithag	3dc23c5708	Fixing UI and implementation issues occurred after restructuring.	2016-04-07 20:41:10 +05:30
charithag	06a7fd2f1a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-07 11:56:14 +05:30
charithag	905f9ae4c1	Fixing UI issues occured after restructuring.	2016-04-07 11:55:48 +05:30
Kasun Delgolla	4e57e5bc85	Committing restructuring mdm-admin + UI merging style fixes	2016-04-07 10:42:56 +05:30
Lakshman	551aaf172b	formatting change	2016-04-06 19:32:41 +05:30
Lakshman	7174d000e0	override hash and equals function in Device to avoid duplicates in collections	2016-04-06 19:05:11 +05:30
Ruwan	a192bfa85c	Merge pull request #207 from rasika90/master ... Adding uuf template app into cdmf-base-ui	2016-04-01 19:29:58 +05:30
Rasika Perera	3e34aeeff4	Fixing "Cannot write to cached file" issue	2016-04-01 18:00:22 +05:30
Rasika Perera	5911c873f3	Adding uuf template app	2016-04-01 15:06:32 +05:30
Kasun Delgolla	04de876265	Merge pull request #206 from charithag/master ... Restructure group related UIs	2016-04-01 13:53:46 +05:30
charithag	99d004b6a6	Restructure group related UIs	2016-04-01 13:30:44 +05:30
Prabath Abeysekara	30e5666750	Merge pull request #205 from charithag/master ... Refactor group management	2016-04-01 12:57:20 +05:30
geethkokila	d6923a1343	Fixing the issue in single condition	2016-04-01 00:25:09 +05:30
mharindu	afbfaf4c1d	Fixed for EMM-1305	2016-03-31 19:33:19 +05:30
mharindu	a2a1e8115d	Fixed conflicts and merged	2016-03-31 18:45:52 +05:30
mharindu	72591eff44	Fixed modify enrollment bug	2016-03-31 18:44:55 +05:30
geethkokila	7318502697	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-31 18:07:55 +05:30
geethkokila	e60a383f4d	Adding fixes to the device search	2016-03-31 18:07:05 +05:30
charithag	f6d224a623	Refactor group management	2016-03-31 17:50:29 +05:30
charithag	d22570dadb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-31 16:57:21 +05:30
charithag	bf58342d81	Refactor group management	2016-03-31 16:27:53 +05:30
Prabath Abeysekara	f1081f7029	Merge pull request #204 from ayyoob/merge-latest ... Merged device type multitenant implementation.	2016-03-31 16:27:35 +05:30
ayyoob	3a3e9cc649	changed analytics components to released version	2016-03-31 05:55:03 +05:30
ayyoob	1b4a9227d8	merged web app publisher code and refactored jwt client extension to adhere to new artefact name	2016-03-31 04:24:30 +05:30
geethkokila	73a82f743f	Adding the changes for device Info bean to stop returing null values and changes done for Device search unit classes	2016-03-30 23:56:44 +05:30
ayyoob	83057acd9a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest	2016-03-30 23:42:47 +05:30
geethkokila	fbc7c0807c	Skipping the validation of task operations	2016-03-30 14:10:17 +05:30
ayyoob	fc725fa767	removed analytics	2016-03-30 13:45:39 +05:30
ayyoob	81ae512f13	Merge pull request #6 from ayyoob/merge-devicetype ... merge device type	2016-03-30 12:20:02 +05:30
ayyoob	026d4ef018	removed analytics	2016-03-30 12:17:46 +05:30
charithag	0a8e00fd1e	Merged with upstream and resolved conflicts.	2016-03-30 02:00:47 +05:30
charithag	3e4ccf6337	Add missing features and component from IoTS-1.0.0-M4	2016-03-30 01:44:04 +05:30
geethkokila	888971ae39	Fixing the oracl and postgres sql datasources and removing the start and end from the search context	2016-03-29 22:46:09 +05:30
charithag	2f0a3388a6	Implemented missing methods in group management.	2016-03-29 18:01:21 +05:30
geethkokila	aa63b5f592	Fixing the application memory usage and adding location based search	2016-03-29 17:48:36 +05:30
charithag	3fd141acdf	Add missing parts and test to group management.	2016-03-29 17:07:56 +05:30
charithag	d1ee1fd578	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-29 12:41:48 +05:30
charithag	fa2f61f48a	Add missing parts in group management	2016-03-29 12:41:38 +05:30
ayyoob	284a6645f0	import required packages	2016-03-29 12:07:58 +05:30
ayyoob	4554aadd82	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-29 11:42:14 +05:30
ayyoob	c45895685b	Added device type multi tenancy capability.	2016-03-29 11:40:58 +05:30
ayyoob	021378df3b	added org.wso2.carbon import package	2016-03-28 23:05:47 +05:30
ayyoob	e06565728e	removed duplicate imports and improper imports	2016-03-28 20:46:38 +05:30
charithag	062a843ca2	Fix for https://wso2.org/jira/browse/IOTS-99	2016-03-28 13:28:49 +05:30
prabathabey	22e579ff15	Fixing build failures causde by missing references to certain packages	2016-03-27 21:17:05 +05:30
prabathabey	3a7ef33c16	Fixing a build failure caused by unresolvable packages consumed by device.mgt.core and code cleanup	2016-03-27 16:58:11 +05:30
prabathabey	284ca1b8e8	Removing obsolete source structures	2016-03-27 16:08:22 +05:30
prabathabey	12c4ba10af	Code cleanup	2016-03-27 16:04:15 +05:30
prabathabey	36161f6288	Merging extended device management functionalities	2016-03-27 16:02:40 +05:30
prabathabey	5e7985dae6	merging group-mgt implementation	2016-03-27 16:01:06 +05:30
prabathabey	b584131160	Fixing build failures in device.mgt.analytics.data.publisher bundle	2016-03-27 13:18:18 +05:30
prabathabey	43926b64b4	Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher	2016-03-27 13:01:26 +05:30
prabathabey	1a43cf6a55	Fixing build faliure caused by not adding a package-import upon org.wso2.carbon.base	2016-03-27 03:06:39 +05:30
prabathabey	5dcd9dfe4a	Merging device analytics feature impl to master	2016-03-27 00:23:37 +05:30
prabathabey	e537e2d841	Adding device.mgt base ui framework	2016-03-25 14:46:19 +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	1826c9ee49	Doing a partial commit for pull	2016-03-14 12:02:36 +05:30
geethkokila	be890c2e9a	Doing a partial commit	2016-03-14 11:55:25 +05:30
geethkokila	7a809c1c01	Doing a partial commit	2016-03-14 11:48:43 +05:30
prabathabey	3726a57d96	Making email-sender a separate component and code cleanup	2016-03-13 00:51:54 +05:30
prabathabey	0b31042aa2	More improvements to the email sending functionality	2016-03-12 15:42:08 +05:30
prabathabey	535c74a962	Improving email sender functionality	2016-03-12 12:46:36 +05:30
Dileesha Rajapakse	8ac485d66d	Fixed Pagination issues in Device and Operation Oracle DAO classes	2016-02-02 17:53:47 +05:30
Dileesha Rajapakse	9204ed900d	Fixed Pagination issues in Oracle DAO classes	2016-02-02 16:37:26 +05:30
Kamidu Sachith	370badf9d3	Preventing infromation leakage	2016-01-28 18:58:24 +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	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
prabathabey	1fe9371558	Fixing https://wso2.org/jira/browse/EMM-1133	2015-12-23 21:41:10 +05:30
prabathabey	cbee88c7d0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-12-23 18:14:42 +05:30
prabathabey	77c4c34858	Fixing https://wso2.org/jira/browse/EMM-1133	2015-12-23 18:13:39 +05:30
harshanl	8d4c09c20f	Fixed EMM-1139	2015-12-23 17:10:12 +05:30
harshanl	9a7093a0f7	Fixed EMM-1146 issue	2015-12-23 15:29:45 +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
Kamidu Sachith	c6e2c01caa	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-12-21 16:45:52 +05:30
Kamidu Sachith	2d23eb86eb	Improve runtime performance	2015-12-21 16:38:42 +05:30
harshanl	a61fe6171a	Refactored pagination code	2015-12-21 14:22:09 +05:30
Dileesha Rajapakse	b25438097e	Fixed issues in EnrollmentDAOImpl	2015-12-18 23:26:01 +05:30
harshanl	6441c201e5	Added search support for pagination	2015-12-18 22:17:07 +05:30
Dileesha Rajapakse	eb680da572	Fixed EMM-1103	2015-12-17 14:57:28 +05:30
harshanl	91ece82eca	Updated operation DAO to sort data in DESC order of timestamp.	2015-12-17 12:52:42 +05:30
harshanl	d4b6ba5e36	Added pagination support for operation management apis.	2015-12-17 10:32:06 +05:30
harshanl	30e8dc885c	Fixed EMM-1034	2015-12-03 20:13:10 +05:30
harshanl	73906f7cda	Fixed EMM-1003	2015-11-30 22:20:33 +05:30
harshanl	d95a198ad6	Fixed EMM-1001	2015-11-30 19:56:47 +05:30
Kamidu Sachith	53064516d3	Fix for the Jira Issue EMM-989	2015-11-26 16:02:16 +05:30
Kamidu Sachith	8573a284e0	Enable Domain name in the invitation main	2015-11-26 11:39:11 +05:30
manoj	e1dc3d2ea3	add notify mechanisam to plugins for some operations - Ex -: IOS send push note to apns when add operation	2015-11-20 22:14:18 +05:30
manoj	99f82e4817	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-20 12:52:32 +05:30
harshanl	b4d17b888b	fixed secondary user-store related issues & multi-tenancy issues	2015-11-20 00:43:01 +05:30
manoj	a04658af14	App Manager integration	2015-11-19 10:21:59 +05:30
manoj	79c268cb41	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-19 10:18:01 +05:30
Dileesha Rajapakse	767ea70436	Refactored CommandOperation DAO class	2015-11-18 22:05:15 +05:30
Dileesha Rajapakse	8bd9295f81	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-17 19:28:40 +05:30
Dileesha Rajapakse	f3cfb79bac	Refactored Operation DAO classes	2015-11-17 19:28:32 +05:30
harshanl	f0471203e7	Added logic to skip device authorization for policy operations	2015-11-17 18:28:42 +05:30
Dileesha Rajapakse	6e95451f57	Refactored Operation DAO class	2015-11-17 17:26:55 +05:30
manoj	dbf8d13ced	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-17 16:15:24 +05:30
manoj	20db31c2a9	Add app manager features	2015-11-17 16:14:51 +05:30
Dileesha Rajapakse	825017a492	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-17 09:58:43 +05:30
Dileesha Rajapakse	4379232c25	Refactored Enrollment DAO class	2015-11-16 22:01:21 +05:30
harshanl	a3e20367f2	Fixed issue in Policy Task when DeviceAuthorization enabled.	2015-11-16 19:51:59 +05:30
Dileesha Rajapakse	6446be100d	Refactored Policy Management DAO classes	2015-11-16 16:49:35 +05:30
Dileesha Rajapakse	91d9db1ffa	Refactored ApplicationMapping and ProfileOperation DAO classes	2015-11-16 14:15:54 +05:30
Dileesha Rajapakse	27254cc922	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 11:45:29 +05:30
harshanl	cb02c9da80	Fixed issues in DeviceAuthorization	2015-11-16 11:43:52 +05:30
Dileesha Rajapakse	6f0276ab2f	Modified Application Mapping DAO classes	2015-11-16 11:39:52 +05:30
Dileesha Rajapakse	7b2cfd69f5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 09:49:37 +05:30
harshanl	b9ca6705ae	Merged changes	2015-11-13 21:57:05 +05:30
harshanl	e14f09b8a8	Added requireDeviceAuthorization support	2015-11-13 21:33:33 +05:30
manoj	fdc4ad8e18	Set user level autherization is support by plugin or not	2015-11-13 21:29:47 +05:30
manoj	22c2da7fcb	Set user level autherization is support by plugin or not	2015-11-13 21:22:38 +05:30
manoj	dc2e41e083	Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction	2015-11-13 19:02:55 +05:30
manoj	adc3b652bf	Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction	2015-11-13 18:57:45 +05:30
Dileesha Rajapakse	786eb93bca	Refactored Operation DAO classes	2015-11-13 14:15:05 +05:30
Dileesha Rajapakse	123ea228ad	Refactored Enrolment DAO class	2015-11-12 10:30:45 +05:30
Dileesha Rajapakse	1975821446	Refactored Device and Application DAO classes	2015-11-11 18:47:02 +05:30
harshanl	5d107b0d56	Merged changes	2015-11-10 18:46:26 +05:30
harshanl	93e641893c	Merged changes	2015-11-10 18:31:02 +05:30
harshanl	026a7c187a	Fixed EMM-945, EMM-910, EMM-911, EMM-870	2015-11-10 18:17:34 +05:30
inosh-perera	4faa740c9d	Fixing JIRA EMM-947 - only the registered device types are returned to UI	2015-11-10 17:36:30 +05:30
harshanl	c826be9b3e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-03 18:59:26 +05:30
harshanl	74a3b0e346	Fixed EMM-910	2015-11-03 18:58:52 +05:30
geethkokila	30c53b7d14	Fixing the EMM-900, Ading the LB host name and port to the email url	2015-11-03 16:24:49 +05:30
geethkokila	2479be9f5a	Fixing the email client issue	2015-11-02 19:37:21 +05:30
Kasun Delgolla	c00b1ee713	Committing fix for JIRA- EMM-860	2015-10-29 20:46:48 +05:30
prabathabey	90240e7d3f	Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts	2015-10-29 14:11:24 +05:30
harshanl	8a1dba166a	Updated FeatureMgr spec	2015-10-28 22:09:01 +05:30
harshanl	340a690995	Added sql script	2015-10-20 10:11:42 +05:30
harshanl	1d4bba9807	License issue fixed	2015-10-20 08:12:02 +05:30
harshanl	09fbf9e8a1	Fixed DAO issues	2015-10-19 22:45:39 +05:30
harshanl	89e930d530	Fixed isssues in pagination	2015-10-18 21:56:13 +05:30
harshanl	25d7459974	Pagination changes	2015-10-18 20:50:39 +05:30
harshanl	155606a326	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-18 18:54:35 +05:30
prabathabey	a0ebec9f3d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-18 18:18:26 +05:30
prabathabey	c74e27102f	Fixing issues in adding license configs	2015-10-18 18:16:52 +05:30
harshanl	81b6770c08	Fixed oauth issue with tenants	2015-10-18 01:44:28 +05:30
harshanl	6c196d5317	Added pagination support	2015-10-16 23:40:13 +05:30
harshanl	9a68aa92bc	Removed the use of web-app context in permission.xml of webapps	2015-10-14 22:33:36 +05:30
harshanl	d4eab9f86e	Code refactored.	2015-10-12 19:48:35 +05:30
harshanl	429b738dba	Fixed issues in permission tree'	2015-10-06 22:41:59 +05:30
harshanl	77f5f466d6	Added scope validator and refactored code	2015-10-06 11:44:40 +05:30
harshanl	648d8ec209	Added OAuth scope validator & fixed DataHolders	2015-10-05 11:28:47 +05:30
harshanl	234cd47931	Added identity-extensions	2015-10-02 18:00:05 +05:30
milanperera	e408d50037	Refactored permission module	2015-10-02 17:07:57 +05:30
milanperera	a0187b905b	Removed unneccessary imports and code segments	2015-10-02 16:57:42 +05:30
milanperera	a84edd7a99	Added seperate permission tree class	2015-10-02 16:40:52 +05:30
milanperera	02ad7fb8e1	Refactored authorization module	2015-10-02 16:40:13 +05:30
milanperera	ed937467cd	Refactored permission authorizer module	2015-10-01 17:35:08 +05:30
milanperera	68befaae01	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-01 12:14:28 +05:30
milanperera	1034eb85c6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-28 16:55:50 +05:30
mharindu	0a321e279a	Added null check to getLicense	2015-09-24 14:37:52 +05:30
Dilshan Edirisuriya	9ce1c2002a	Null check in DAO	2015-09-22 14:09:59 +05:30
milanperera	126c2ec371	Implemented permission authorizing module	2015-09-17 11:09:31 +05:30
milanperera	47ac0b1146	Fixed conflicts and merged local changes	2015-09-15 10:22:53 +05:30
Dilshan Edirisuriya	ac5a7f4ab1	Null check in JWT authenticator and fixing tenant id issue in device DAO	2015-09-14 17:12:07 +05:30
milanperera	37854a2cef	Partial Commit	2015-09-14 15:51:23 +05:30
Dilshan Edirisuriya	5f2ec88300	Changes in certificate managment	2015-09-14 15:28:28 +05:30
Dilshan Edirisuriya	3907c0fba2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-14 15:23:18 +05:30
Dilshan Edirisuriya	4a03c7abf7	certificate authentication changes	2015-09-14 15:23:11 +05:30
harshanl	b8720917e1	Added Dynamic-client-registration module	2015-09-11 20:53:19 +05:30
milanperera	517039cccb	Partial commit	2015-09-10 11:20:29 +05:30
mharindu	2331b61bdc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-08 11:16:41 +05:30
harshanl	bf0e95fa6c	Fixed notification service issues	2015-09-07 18:14:20 +05:30
harshanl	330f059a09	Added App-Mgt config testcases	2015-09-05 01:26:52 +05:30
mharindu	3421663724	Fixed conflics and merged	2015-09-04 11:15:59 +05:30
geethkokila	4500aacd38	Adding the scep support for getting the device tenant id	2015-09-03 23:38:27 +05:30
mharindu	0e7ff3c0c8	Merged	2015-09-03 20:40:49 +05:30
hasuniea	581c4f013b	refactored changes	2015-09-03 20:19:28 +05:30
mharindu	069c7e7c5f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-03 12:03:41 +05:30
harshanl	bbec523a47	Added notification mechanism	2015-09-03 00:19:58 +05:30
mharindu	cbf10a8b59	Refactored addOperation method	2015-09-02 17:35:41 +05:30
hasuniea	7642112a9f	code clean up	2015-09-02 17:27:28 +05:30
mharindu	0c43338f5d	Added runtime exception to DCA	2015-09-02 16:16:18 +05:30
mharindu	1903b375f3	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-02 15:34:11 +05:30
geethkokila	5ee8c0f065	Fixing the cache manager issues	2015-09-02 14:47:36 +05:30
hasuniea	9d5f2af7e9	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-02 14:26:15 +05:30
mharindu	725894ed2c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-01 18:20:09 +05:30
geethkokila	f2b8f978f5	Fixing the operations connection close problems	2015-09-01 18:15:02 +05:30
mharindu	cd853c9ee8	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-01 17:20:12 +05:30
geethkokila	b14461a5af	Fixing the datasource issue in the device magt core	2015-09-01 17:16:51 +05:30
mharindu	ad5335c9f5	Fixed local conflicts and merged	2015-09-01 15:29:24 +05:30
mharindu	6385c13012	Fixed issues in DeviceDAO	2015-09-01 15:25:16 +05:30
prabathabey	2b6bf203e2	Resolving conflicts observed in policy management implementation	2015-09-01 15:06:41 +05:30
mharindu	fd29deb372	Fixed conflicts of local repo and merged	2015-09-01 12:57:13 +05:30
prabathabey	892b9681f5	Fixing transaction handling issues	2015-09-01 12:51:18 +05:30
geethkokila	458618191d	Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases	2015-08-31 19:31:13 +05:30
geethkokila	c673395ce6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-08-31 17:13:42 +05:30
harshanl	20873e7786	Added null checks	2015-08-31 14:37:44 +05:30
geethkokila	c6d993e532	Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task	2015-08-30 21:45:56 +05:30
Your Name	b906d43cc8	Committing tenant configuration manager service	2015-08-29 22:14:07 +05:30
geethkokila	bcb2c1ddb1	Commiting the monitoring changes and test case changes	2015-08-29 17:39:07 +05:30
geethkokila	44b496d350	Partially commiting due to update	2015-08-28 12:33:10 +05:30
hasuniea	7a54838996	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-08-28 12:22:07 +05:30
mharindu	69cf3f8939	Cleaned code and added comments	2015-08-27 17:15:37 +05:30
mharindu	abc16557dc	Removed unnecessary new lines in DeviceDAOImpl	2015-08-27 10:45:10 +05:30
mharindu	460fda1bb9	Removed unnecessary new lines in DeviceDAOImpl	2015-08-27 10:43:52 +05:30
harshanl	aeed8b92a1	Enabled adding custom permissions to permission-tree through webapps	2015-08-26 18:20:37 +05:30
mharindu	8c748b3dfd	Removed unnecessary comments	2015-08-26 17:45:21 +05:30
hasuniea	9f6dd55223	fixed issue in modify enrollment	2015-08-26 14:05:21 +05:30
harshanl	1850a76462	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-08-25 09:47:11 +05:30
prabathabey	3582973f84	Code cleanup	2015-08-24 11:04:47 +05:30
prabathabey	d4c5d9023e	Adding necessary instructions for transaction handling	2015-08-24 11:04:28 +05:30
prabathabey	de2c378214	Code cleanup	2015-08-24 10:15:50 +05:30
harshanl	423c8e2727	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-08-24 10:05:24 +05:30
prabathabey	ce0cc1699f	Fixing more transaction handling related issues	2015-08-23 20:19:20 +05:30
prabathabey	cdbdc86f42	Fixing transactional anomalies and code cleanup	2015-08-22 03:56:44 +05:30
harshanl	076d60ec83	PermissionManager changes	2015-08-22 03:01:20 +05:30
prabathabey	d7e363cef7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-08-22 01:51:56 +05:30
prabathabey	00807e8295	Fixing transaction anomalies and code clean up	2015-08-22 01:51:42 +05:30
Prabath Abeysekara	a5c9886c63	Merge pull request #25 from milanperera/master ... Fixed "204 Content Not Found" issue in LicenseManager	2015-08-22 00:51:12 +05:30
mharindu	f36c82b059	Refactored LicenseManager	2015-08-22 00:47:17 +05:30
mharindu	4709107719	Refactored LicenseManager	2015-08-22 00:31:18 +05:30
mharindu	8949992148	Fixed 204 issue in LicenseManager	2015-08-22 00:12:24 +05:30
Dilshan Edirisuriya	3c444f6102	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Conflicts: components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java	2015-08-21 14:53:36 +05:30
dilanua	4e5a38998d	Updating DAO Layer	2015-08-07 22:09:51 +05:30
dilanua	df81bef812	Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus	2015-08-07 18:13:42 +05:30
geethkokila	149b743a2e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-08-07 12:27:43 +05:30
harshanl	58c45c92be	Fixed tenant configuration persisting issue	2015-08-06 18:11:40 +05:30
geethkokila	c039adf4ea	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-08-03 18:21:10 +05:30
prabathabey	c41f6c3002	Code cleanup	2015-08-03 17:22:46 +05:30
geethkokila	3fa65ae98c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-30 23:32:12 +05:30
milanperera	e30956b619	Fixed an issue in SQL query of getPendingOperations(CommandOp)	2015-07-30 18:34:56 +05:30
milanperera	508082808c	Fixed a bug in commons.licence	2015-07-30 17:10:12 +05:30
prabathabey	84bc22f9f3	Setting default values for fields validFrom and validTo	2015-07-30 16:56:45 +05:30
prabathabey	536e13b0a7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-30 15:17:03 +05:30
prabathabey	53302070e6	Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl	2015-07-30 15:16:12 +05:30
geethkokila	cb489c0174	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-29 19:52:59 +05:30
Dilshan Edirisuriya	37763b7e40	Importing org.wso2.carbon.device.mgt.common	2015-07-29 11:43:45 +05:30
geethkokila	b8462b02ac	Fixing the conflicts	2015-07-29 07:30:14 +05:30
prabathabey	c134cc7e25	Fixing license manager initialization related issues and code cleanup	2015-07-28 20:38:02 +05:30
prabathabey	ca38cc9f51	Removing URL printer start-up handler from device.mgt.core	2015-07-28 18:09:49 +05:30
prabathabey	c471017c40	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-28 17:25:54 +05:30
prabathabey	134b4ae53c	Code cleanup	2015-07-28 17:25:41 +05:30
Dilshan Edirisuriya	e7f02365a8	Importing axis2.transport.mail	2015-07-28 16:42:20 +05:30
prabathabey	54cd6b80f4	Fixing merge conflicts	2015-07-28 15:21:06 +05:30
prabathabey	955c119006	Adding policy delegation	2015-07-28 15:19:34 +05:30
geethkokila	dc205aa081	Fixing the conflicts	2015-07-27 20:32:12 +05:30
geethkokila	6d687364c6	Fixing the monitoring tasks	2015-07-27 12:27:12 +05:30
milanperera	256880089e	Merged	2015-07-27 11:16:03 +05:30
prabathabey	1716c2c7f6	Making apimgt extensions module a separate component/feature pair	2015-07-25 12:41:18 +05:30
prabathabey	1a6526fc77	Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module	2015-07-24 19:22:14 +05:30
milanperera	5b2e0c8989	Merged	2015-07-24 12:32:26 +05:30
prabathabey	a68ca0cfd6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-24 12:08:12 +05:30
prabathabey	8394b63e0c	Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions	2015-07-24 12:07:57 +05:30
milanperera	7ec10d670c	Fixed bugs in device disenrolment	2015-07-23 17:32:05 +05:30
milanperera	5a8975d7ac	Partial Commit	2015-07-23 16:55:54 +05:30
milanperera	35ce4be1a1	Partial Commit	2015-07-23 15:55:32 +05:30
Prabath Abeysekara	3512e3e60a	Merge pull request #20 from milanperera/master ... Refactored SQL queries	2015-07-23 14:50:57 +05:30
milanperera	6f56e27f1d	Refactored SQL queries	2015-07-23 14:46:22 +05:30
prabathabey	6c857fdc4d	Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications	2015-07-23 14:35:02 +05:30
geethkokila	bd75f70a24	Fixing the merge conflicts	2015-07-23 10:17:04 +05:30
geethkokila	6270dff93c	Fixing priviledege carbon context issue in device-mgt component	2015-07-23 10:14:24 +05:30
prabathabey	d9459b09ba	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-23 10:02:02 +05:30
prabathabey	fac53e4814	Upgrading tomcat version usd in carbon-devicemgt	2015-07-23 10:01:56 +05:30
prabathabey	9e5e3cf73d	Enforcing proxy port to be used when configured	2015-07-23 09:57:50 +05:30
prabathabey	e4fd0607e8	Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code	2015-07-22 23:43:12 +05:30
prabathabey	15d56e29c3	temporarily commenting out test cases till tenancy-test bits are properly added	2015-07-22 23:41:05 +05:30
geethkokila	9dc5a1e2e5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-22 17:24:50 +05:30
geethkokila	aee2402d0d	Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home	2015-07-22 17:24:33 +05:30
harshanl	c2ef90d399	added class comments	2015-07-22 15:47:25 +05:30
harshanl	50640c9dfd	Added tenant configuration persistance	2015-07-22 15:36:16 +05:30
prabathabey	7d089d8b09	Removing IDE warnings	2015-07-21 19:13:16 +05:30
prabathabey	a461e887d1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-21 19:12:34 +05:30
prabathabey	87e632866b	Fixing connection leaks spotted in operation management implementation	2015-07-21 19:12:22 +05:30
harshanl	57299063b3	Added policy configuration to the cdm-config	2015-07-20 11:16:15 +05:30
manoj	4049d1a2b4	Remove properties from config operations	2015-07-20 09:39:38 +05:30
geethkokila	38939d6c7b	Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master	2015-07-16 22:56:32 +05:30
prabathabey	ff2c29a158	Registering license managment service	2015-07-16 19:57:03 +05:30
manoj	ac3438e2cd	Code refactor application update	2015-07-16 13:17:43 +05:30
milanperera	05fd385d49	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-16 12:11:23 +05:30
manoj	f8c1cbc405	change generated keys to prepared statement constant	2015-07-16 01:01:07 +05:30
manoj	b0a55a55c8	code clean up	2015-07-15 20:41:10 +05:30
milanperera	f14ba29d30	Merged	2015-07-15 13:57:32 +05:30
milanperera	854b7dda8d	Merged	2015-07-15 13:56:21 +05:30
manoj	a6cee6bae3	change update operation response to object	2015-07-15 12:44:55 +05:30
manoj	3bbbed40e6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-15 12:11:58 +05:30
manoj	25a8f60d74	Retuen int for operations	2015-07-15 12:11:00 +05:30
kasundananjaya	2d1433a2f0	Merge pull request #16 from milanperera/master ... Refactored dynamic-client-registration unregister function	2015-07-15 12:05:29 +05:30
manoj	27279426f0	code clean up	2015-07-15 11:02:54 +05:30
manoj	00819fe4b6	Unit tests, application update	2015-07-15 07:38:13 +05:30
manoj	de17217303	Unit tests, application update	2015-07-15 07:37:20 +05:30
milanperera	a82351f53f	Refactered getDevicesByType query	2015-07-14 20:31:37 +05:30
milanperera	a5a9d02dee	Implemented getDeviceByStatus function	2015-07-14 19:39:03 +05:30
manoj	6daa71771c	Unit tests for service layer	2015-07-14 17:12:45 +05:30
manoj	41d1408b14	Add application update and unit tests	2015-07-14 11:00:16 +05:30
manoj	da61c08fac	Add application update and unit tests	2015-07-14 10:59:39 +05:30
mharindu	0a671373e5	Merged with local changes	2015-07-13 17:37:04 +05:30
mharindu	9d8c52958d	Refactored SQL queries and added null checks	2015-07-13 17:24:45 +05:30
prabathabey	a886430005	Initializing Device Management providers	2015-07-09 22:17:22 +05:30
prabathabey	fd6793a9af	Fixing device management API structure	2015-07-09 22:07:15 +05:30
manoj	0e2e0fdd0e	Remove package attribute form Application	2015-07-08 14:18:04 +05:30
Dilshan Edirisuriya	3908705b68	Null check	2015-07-07 18:18:23 +05:30
geethkokila	388701c3a2	Adding partial commit to add a interface for plugins to implement to notify devices for monotoring	2015-07-07 11:54:24 +05:30
prabathabey	dea6d12173	Fixing more issues in SQL queries used in DeviceDAOImpl	2015-07-06 19:36:21 +05:30
prabathabey	043440eb76	Fixing an invalid table name used in getDevices() method	2015-07-06 18:59:57 +05:30
manoj	286a04dd31	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-06 18:15:54 +05:30
manoj	cc5dd3baa6	Move add application list, get applist methods to applicationServiceProvider	2015-07-06 18:15:04 +05:30
geethkokila	8bc7c5824a	Fixing test case failures and device dao errors	2015-07-06 17:57:59 +05:30
manoj	66afd0be4b	Change updateApplicationList method	2015-07-06 14:03:37 +05:30
manoj	a8ae030fe7	Remove updateApplication List method from ApplicationManager interface. This is not need to implement for plugins	2015-07-06 13:20:34 +05:30
prabathabey	431c86ae0e	Refactoring the implementation of app installation/uninstallation and getting EMM URL printed on the server console	2015-07-06 11:50:38 +05:30
prabathabey	7a6e947810	Making Device object return enrolment data too	2015-07-04 14:52:32 +05:30
prabathabey	974a616737	DAO refactoring	2015-07-04 14:24:35 +05:30
prabathabey	8d348a358c	Committing initial version of supporting device life cycle management	2015-07-04 12:12:47 +05:30
harshanl	952db0183d	Moved updateApplicationListOfDevice method to DeviceMgtService	2015-07-03 18:13:02 +05:30
Dilshan Edirisuriya	8c59d82708	Making serializable	2015-07-03 16:30:55 +05:30
harshanl	20a9d1222f	Added a method to retrieve list of applications installed on a device	2015-07-03 14:35:26 +05:30
manoj	d30048d94d	change properties	2015-07-03 11:43:59 +05:30
manoj	65b1ea70ab	Add properties to store mobile app specific meta data	2015-07-02 18:07:35 +05:30
manoj	567f78abb6	Add additional fields to load device	2015-07-02 15:06:18 +05:30
prabathabey	d28de90679	Fixing an invalid database table name used in DeviceDAOImpl	2015-06-30 12:35:25 +05:30
manoj	f3dd402e4b	Set device status to active when poll operations	2015-06-25 21:13:55 +05:30
manoj	6263a550ff	Set device enrolment status	2015-06-25 20:25:08 +05:30
manoj	65620a7389	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-06-23 13:33:46 +05:30
manoj	83698e7a99	AppList update for device	2015-06-23 13:30:24 +05:30
manoj	1aa22b29c5	AppList update for device	2015-06-23 13:02:20 +05:30
manoj	4510a954a5	AppList update for device	2015-06-23 13:02:06 +05:30
prabathabey	1dd9134e5d	Fixing poms to remove device.mgt.user.* dependencies	2015-06-23 01:06:16 +05:30
prabathabey	22bf894d45	Removing the redundant user-mgt component, which has been there as part of carbon-device-mgt repository	2015-06-23 00:58:42 +05:30
manoj	78ee8e334f	Remove app list update method from app manager interface	2015-06-22 22:03:23 +05:30
manoj	6f2c51ee36	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-06-22 21:22:16 +05:30
manoj	82cbbef83b	Application list saving method and device operation response saving	2015-06-22 21:21:50 +05:30
prabathabey	60ee259b2b	Fixing DeviceDAOs to associate tenant id to filter out tenant specific resources	2015-06-22 20:36:31 +05:30
manoj	0e18ebcf4e	Synchronize plugin register	2015-06-19 17:35:15 +05:30
manoj	aa8de8cb23	Add all registerd devices to newly registerd plugin listner	2015-06-19 14:23:32 +05:30
manoj	7497a1d033	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-06-19 11:38:25 +05:30
manoj	856fea3455	fix instansiating of device provider serviceImpl with empty plugin repo	2015-06-19 11:37:58 +05:30
prabathabey	c0cbc59a03	Code cleanup	2015-06-18 18:44:08 +05:30
prabathabey	a2dc916fd0	Fixing issues in plugin initialization as a result of certain plugins getting initialized after the device management component is done getting configured	2015-06-18 18:32:14 +05:30
prabathabey	2526d87c21	Introducing a separate bean to carry all enrolment data	2015-06-18 00:11:00 +05:30
prabathabey	60960d80b4	More code cleanups	2015-06-16 14:42:50 +05:30
prabathabey	c13975191e	Code cleanup	2015-06-13 00:44:21 +05:30
manoj	0de6ff09e7	Change get device by name query	2015-06-09 16:37:52 +05:30
manoj	21ea3a4428	change device type query	2015-06-09 16:33:09 +05:30
manoj	651cfdc6cb	Check if pending operations empty	2015-06-08 17:30:45 +05:30
manoj	61ebf6beb4	Remove status field from get next operations query	2015-06-08 15:41:28 +05:30
manoj	6a1cf1b3f8	Remove status field from get next operations query	2015-06-08 15:24:11 +05:30
Dulitha Wijewantha	34a8641582	* Added update device implementation	2015-05-30 22:11:43 +05:30
manoj	05a3244040	Add payload to policy operation	2015-05-30 02:16:50 +05:30
manoj	0f7df72167	Cast to operation type in dto convertion	2015-05-30 01:54:04 +05:30
manoj	245d3706a2	Invoke policy operation dao	2015-05-30 01:16:47 +05:30
manoj	e948075bc5	Invoke policy operation dao	2015-05-30 01:07:44 +05:30
manoj	6188878340	Add operation code for policy operation	2015-05-30 00:51:58 +05:30
manoj	a4e6b02e60	Add operation type for policy operation	2015-05-30 00:42:46 +05:30
manoj	14c6773b57	Fetch device according to the device identifier	2015-05-29 22:26:09 +05:30
manoj	39b85a3b44	update operation status	2015-05-29 21:58:15 +05:30
manoj	0ed9c46a64	set operation status	2015-05-29 20:07:24 +05:30
manoj	f68c7133cf	Check null before close connection	2015-05-29 19:56:29 +05:30
manoj	3dcb42ee64	fix connection close issue while call super getOperation method inside loop	2015-05-29 19:40:06 +05:30
manoj	9f592f8a33	fix operation id field issue	2015-05-29 19:06:34 +05:30
manoj	3c99c9ec2c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-29 18:24:59 +05:30
manoj	7fb3a594b8	Instansiate Policy DAO in operations dao factory	2015-05-29 18:23:42 +05:30
prabathabey	6c6f644892	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-29 17:57:59 +05:30
prabathabey	de9b17f41f	Modifying Device bean definition	2015-05-29 17:57:45 +05:30
manoj	f8fbbdb467	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-29 17:51:19 +05:30
manoj	d15f19dab2	correct sql ambiguos selection of operation id	2015-05-29 17:38:19 +05:30
prabathabey	cdcba23021	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-29 17:30:47 +05:30
prabathabey	72e940b523	Code cleanup	2015-05-29 17:30:34 +05:30
manoj	e2ef2504a9	Y ... Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-29 17:00:50 +05:30
prabathabey	d444f4ce0c	Adding an interface method to DeviceManager.java to support claimable devices	2015-05-29 16:52:02 +05:30
manoj	54c776000f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-1.0.0	2015-05-29 15:54:51 +05:30
manoj	c3805364c9	Refractor Operations to handle Policy Operations and remove joins	2015-05-29 15:54:40 +05:30
manoj	917c0cf965	Refractor Operations to handle Policy Operations and remove joins	2015-05-29 15:54:15 +05:30
mharindu	3d549701a4	Fixed query issue in function getDevicesByName	2015-05-28 17:45:11 +05:30
mharindu	de8914fdcb	Added a function to retrieve device list from device name	2015-05-28 14:55:34 +05:30
manoj	f2c33f9421	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-22 13:22:37 +05:30
manoj	cfe9bd5f9f	Email format	2015-05-22 13:22:00 +05:30
dilanua	851fb35554	Updated DeviceTypeDAOImpl.java	2015-05-22 04:28:26 +05:30
mharindu	ffaccbe371	Refactored policy	2015-05-22 03:03:46 +05:30
manoj	48a2062f64	Add operations for effective policy	2015-05-22 02:32:04 +05:30
mharindu	39ae880972	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-22 01:23:17 +05:30
mharindu	89d0fa0894	Implemented device count and policy count	2015-05-22 01:23:03 +05:30
manoj	acdf6021a7	Policy related operations	2015-05-22 01:19:27 +05:30
manoj	85df7ca9a0	Policy related operations	2015-05-22 01:18:44 +05:30
mharindu	3d69503e96	Merged	2015-05-20 14:25:17 +05:30
mharindu	048c175fda	Fixed issue of get device info function	2015-05-19 19:08:24 +05:30
Milan Perera	c068ac88de	Update DeviceManagementServiceImpl.java	2015-05-19 17:30:20 +05:30
Milan Perera	7d3bf84d9f	Update DeviceManagementServiceProviderImpl.java	2015-05-19 17:26:24 +05:30
Milan Perera	8f00128ab1	Update DeviceManager.java	2015-05-19 17:22:36 +05:30
mharindu	40feabb9df	Fixed bug in device disenrollment	2015-05-19 17:13:36 +05:30
mharindu	847eb073b9	Refactored device info	2015-05-19 15:43:15 +05:30
mharindu	ead4d3be69	Refactored device info	2015-05-19 11:19:41 +05:30
manoj	f25dc65b54	Refractor device mgt user core service	2015-05-18 19:30:16 +05:30
manoj	c918622cc6	Refractor Email service and change user server feature name ... components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml	2015-05-18 19:27:41 +05:30
mharindu	6b84d65e29	Refactored updateDeviceInfo function	2015-05-18 15:14:14 +05:30
manoj	6c80688af2	Remove app list from device info update service	2015-05-18 15:02:18 +05:30
mharindu	0f3a981367	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-18 11:14:11 +05:30
manoj	2d5d0bb4f8	Install APP service	2015-05-18 02:52:38 +05:30
manoj	94fbb56f06	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-18 02:31:15 +05:30
manoj	3589804ede	Installation APP service	2015-05-18 02:31:10 +05:30
harshanl	db2065435b	Added getAllDevicesOfUser and getAllDevicesOfRole methods with user feature	2015-05-17 17:56:44 +05:30
mharindu	c892c0b783	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-15 15:12:18 +05:30
manoj	1b1b66fc29	Handle DB close within rollback transaction	2015-05-15 15:04:13 +05:30
manoj	f4b8e4bb74	Remove delete device type from DB when un register plugin	2015-05-15 12:04:01 +05:30
mharindu	aeb9c6e5aa	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-15 11:49:08 +05:30
manoj	a774bc89aa	Device Type not present in DB, return null instead of dummy object	2015-05-15 02:43:41 +05:30
mharindu	937530087d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-14 22:14:07 +05:30
mharindu	f83897708c	Merged	2015-05-14 22:13:57 +05:30
manoj	bf62561b00	Change Next operations method to accept parameter device id	2015-05-13 23:34:03 +05:30
manoj	9b5f6bc171	Change next operations to join profile operations	2015-05-13 18:25:52 +05:30
manoj	76c697453e	Change platforms to lower case	2015-05-13 17:44:54 +05:30
manoj	3f78271847	Refractor application bean	2015-05-13 11:39:11 +05:30
manoj	58a7964b34	Refractor Application bean	2015-05-13 11:31:03 +05:30
manoj	3df761bba6	Refractor Application bean	2015-05-13 11:30:40 +05:30
manoj	696ab3554c	Refractor Application bean	2015-05-13 11:30:26 +05:30
manoj	6c452433de	Correct copy right text	2015-05-12 21:02:26 +05:30
manoj	9cf2d33c59	Correct copy right text	2015-05-12 21:00:16 +05:30
Prabath Abeysekara	00e8076a9d	Merge pull request #7 from milanperera/master ... Fixed a bug in update Operation	2015-05-12 19:33:45 +05:30
geethkokila	73b185e1e6	Removing feature implementation from the policy, adding criteria based policy	2015-05-12 16:20:18 +05:30
manoj	60f50a9242	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-11 12:32:37 +05:30
manoj	3a7c4b77b8	APP Manager Integration	2015-05-11 12:31:12 +05:30
manoj	2ae89bef59	APP Manager Integration	2015-05-11 12:30:07 +05:30
Milan Perera	d86a5ccc4a	Fixed a bug in update Operation	2015-05-08 18:15:12 +05:30
Milan Perera	47183e12f2	Update ConfigOperation.java	2015-04-30 12:05:26 +05:30
mharindu	3dda515add	Fixed a bug in add operation function	2015-04-30 11:01:38 +05:30
manoj	2d5f8fe937	Refractor Operations Mgt	2015-04-28 17:57:06 +05:30
manoj	5a4e4ec4a0	Operations Refractor	2015-04-28 14:42:59 +05:30
manoj	4f4240f176	Operations Refractor	2015-04-24 12:53:07 +05:30
manoj	d0b553d26a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-04-24 12:34:20 +05:30
manoj	a46aff84fd	fetch command operation enable property	2015-04-24 12:34:04 +05:30
DilanUA	aabe9afff5	Updated back-end email notification functionality	2015-04-21 15:14:48 +05:30
manoj	42c368934b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-04-21 15:00:23 +05:30
manoj	bc10bf9257	Fix operations sql changing column names operation details	2015-04-21 14:59:29 +05:30
Dulitha Wijewantha	f558357c2a	Fixed syntax issues due to spacing	2015-04-21 13:33:32 +05:30
DilanUA	625ad6d1dc	Fixed some possible NPE issues in DeviceManagementServiceProviderImpl.java	2015-04-20 20:58:19 +05:30
manoj	79444e951a	Change User registration mail	2015-04-20 18:06:38 +05:30
manoj	382b876f7f	User Registration email	2015-04-17 20:11:24 +05:30
manoj	d81ca8c194	User registration email	2015-04-17 19:13:18 +05:30
manoj	20463cca57	User registration email configurations	2015-04-17 19:13:00 +05:30
manoj	932cb003da	Refactor operations	2015-04-17 07:43:42 +05:30
manoj	4aac14b3d1	Refactor Operations	2015-04-15 21:41:09 +05:30
manoj	41edb530bc	Refactor Operations	2015-04-15 21:40:13 +05:30
manoj	21782b0714	Check operation status as pending for next operations	2015-04-08 20:49:23 +05:30
manoj	32db7a1011	Check operation status as pending for next operations	2015-04-08 20:49:11 +05:30
manoj	2e051d8df5	Refactor operations mgt connection handling	2015-04-08 20:27:16 +05:30
Dilshan Edirisuriya	8daf620b0c	Setting payload method refactoring	2015-04-08 19:47:00 +05:30
manoj	749f2b782e	Change blob read method	2015-04-08 17:30:06 +05:30
manoj	45d6c08773	Remove connection from thread local at close	2015-04-08 16:37:51 +05:30
manoj	8e4c181446	Get profile operations from nect operations method	2015-04-08 16:25:49 +05:30
manoj	f93d710d8e	For operation is profile operation get Next operations from profile operation DAO	2015-04-08 15:37:40 +05:30
manoj	eb500658f2	Move payload property to operation object	2015-04-08 13:27:35 +05:30
manoj	1c80fcd124	Remove paylooad property from Operation	2015-04-08 13:01:43 +05:30
manoj	0f55d86b08	Update Operations Begin transactions before update DB	2015-04-07 19:37:20 +05:30
manoj	fc5be1d059	Update operation rollback and commit	2015-04-07 19:15:03 +05:30
manoj	416ef5a745	Update Operation manager implementation	2015-04-07 19:07:21 +05:30
manoj	4a9a27ab7e	Refactor operation DAO methods.Add connection close util method	2015-04-07 15:34:10 +05:30
manoj	32b86c7ff1	ADD Operation Code to core operation table	2015-04-06 19:23:26 +05:30
manoj	cf247128b3	init operation mgt data connection	2015-04-06 18:01:57 +05:30
manoj	a32e811183	Update operation DAO implementation	2015-04-06 17:17:20 +05:30
manoj	71713d4baf	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-04-06 17:07:51 +05:30
manoj	465f421aa8	Update operation method DAO implementation	2015-04-06 17:07:38 +05:30
prabathabey	bf88170668	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-04-06 14:50:12 +05:30
prabathabey	97a303e495	Temporarily disabling schema enforcement upon reading configuration files	2015-04-06 14:49:54 +05:30
manoj	4312d528dd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-04-06 11:08:11 +05:30
manoj	a4b83a4737	Implement operation DAO get next operation method	2015-04-06 11:07:57 +05:30
prabathabey	7b99fb5f9d	Adding simple policy processing engine implementation together with some oauth extension implementation to support dynamic client authentication	2015-04-03 20:57:51 +05:30
prabathabey	93b88828cc	Refactoring Device management related configuration file intialization process to associate appropriate schemas corresponding to each of the said configs	2015-04-03 20:32:15 +05:30
manoj	85b1d4c7d1	Add payload type to profile operation table	2015-04-02 19:25:45 +05:30
manoj	0267c8cb1c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-04-02 11:20:25 +05:30
manoj	80bf3640f6	Change operation status to varchar	2015-04-02 11:19:03 +05:30
Dilshan Edirisuriya	52b48f3223	Reading from enum	2015-04-01 19:32:25 +05:30
Dilshan Edirisuriya	4198764cb2	Implementing services	2015-04-01 19:23:04 +05:30
manoj	e1b2e40847	Set profile operation DAO for profile operations	2015-04-01 18:54:32 +05:30
manoj	7cf5460fe6	Set profile operation DAO for profile operations	2015-04-01 18:54:09 +05:30
prabathabey	befb9cc711	Extending operation management implementation to support getPendingOperations() and getOperations() functionalities	2015-03-31 16:59:02 +05:30
prabathabey	0583695338	Fixing improper API name getting displayed when an API is republished	2015-03-31 13:11:38 +05:30
prabathabey	36dea72e02	Fixing API publishing related issues	2015-03-31 11:53:33 +05:30
prabathabey	5d02746a5e	Fixing API publishing related issues	2015-03-30 20:45:34 +05:30
prabathabey	2b26ad08c2	Adding an info log to indicate the success of publishing a given API	2015-03-30 19:28:26 +05:30
prabathabey	add470c483	Fixing AppManager connector initialization issue at server start up and adding support for retrieving the complete operation list for a given device	2015-03-30 12:26:29 +05:30
prabathabey	5f7e4306de	Adding support to retrieve the next available operation to be installed	2015-03-30 11:10:07 +05:30
prabathabey	e6d74ac9b4	Cleaning up app manager connector implementation	2015-03-29 13:01:07 +05:30
prabathabey	14e7be6146	Extending operation management functionality to support Profile operations	2015-03-28 20:00:49 +05:30
prabathabey	365d5a4c73	Committing changes to Operation bean	2015-03-28 19:57:14 +05:30
harshanL	a6363348b5	Fixed getFeatureManager method	2015-03-27 22:58:19 +05:30
prabathabey	1f587bddf8	Code cleanup	2015-03-27 17:59:12 +05:30
prabathabey	8ac5cb47a7	Code cleanup	2015-03-27 17:13:25 +05:30
prabathabey	103a83d425	Adding the remaining interface methods that are required to support the complete set of operation management related tasks	2015-03-27 13:24:20 +05:30
prabathabey	0d5c80c80b	More code cleanups	2015-03-27 13:12:27 +05:30
prabathabey	98e1d5b1ec	Mode code cleanups	2015-03-27 13:09:15 +05:30
prabathabey	92198a40c0	More code cleanups	2015-03-27 13:02:41 +05:30
prabathabey	1a1700d219	Code cleanup	2015-03-27 12:56:21 +05:30
manoj	9a1ffa6ab7	Add listner to Data source service	2015-03-27 00:11:21 +05:30
manoj	105bc2c6cf	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-03-26 22:28:54 +05:30
manoj	bee82d40e2	Add payload parameter to update operation	2015-03-26 22:28:14 +05:30
prabathabey	dd03eafe9d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-03-26 20:35:52 +05:30
prabathabey	8f83027e74	Making plugin registration deferred till the core completely registered	2015-03-26 20:35:32 +05:30
manoj	9b665eaddb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-03-26 20:32:41 +05:30
manoj	e3acecd5a0	Create databases for plugins	2015-03-26 20:32:04 +05:30
inosh-perera	2002c92032	adding existing API check before publishing	2015-03-26 19:40:00 +05:30
manoj	7e0f4a4b2f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-03-26 19:22:00 +05:30
prabathabey	a0571dd310	Fixing API endpoint not getting properly added when the APIs are registered	2015-03-26 17:30:29 +05:30
manoj	ab08b835f4	Create plugin level databases	2015-03-26 17:20:52 +05:30
prabathabey	7c39871feb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-03-25 20:29:27 +05:30
prabathabey	2cef474281	Adding deactivate method into the service component	2015-03-25 20:29:23 +05:30
inosh-perera	504099a2c4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-03-25 20:04:22 +05:30
inosh-perera	4a061e7be2	adding App management integeration related code	2015-03-25 20:03:06 +05:30
prabathabey	bcc1cad6e5	Merging Webapp authenticator framework implementation	2015-03-25 18:46:17 +05:30
prabathabey	3070488adf	Fixing Pom issues	2015-03-24 18:28:56 +05:30
manoj	fee9fbad7d	Refactor Email Functionality	2015-03-24 18:15:45 +05:30
manoj	55d57f6577	Refactor email functionality	2015-03-24 17:57:58 +05:30
manoj	ee6c067398	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-03-24 17:49:53 +05:30
Dulitha Wijewantha	6d7f6767b5	* Implemented the OperationManager’s mapping of device and operation ... * Change method signature of OperationMappingDAO.addOperationMapping to support a list of device id integers * Removed h2.sql and added them to CreateH2TestDB.sql in the test resources * Cleaned up the DeviceManagementBaseTest class	2015-03-24 09:36:42 +05:30
manoj	d7aa86cc0b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-03-23 20:52:54 +05:30
manoj	3e51415a64	Refactor Email functionality	2015-03-23 20:52:28 +05:30
manoj	03b4f41a2e	Refactor Email functionality	2015-03-23 20:52:08 +05:30
prabathabey	c40af0de7a	Moving API registration bits to device.mgt.core	2015-03-23 18:18:37 +05:30
prabathabey	fc80514d74	Resolving merge conflicts	2015-03-23 12:19:07 +05:30
manoj	0a824d9644	Format enrol email message	2015-03-23 12:16:51 +05:30
prabathabey	d71ea209c2	Code cleanup	2015-03-23 12:16:34 +05:30
manoj	7dfd3f0dd2	Improve email message format	2015-03-20 20:30:49 +05:30
manoj	e6d0d3fd00	Email format	2015-03-20 20:00:21 +05:30
manoj	a458c71789	Email format	2015-03-20 19:50:07 +05:30
prabathabey	8b3d8b74bf	Fixing more feature management related changes	2015-03-20 18:06:05 +05:30
prabathabey	80908bac1e	Adding feature manager related changes	2015-03-20 17:50:56 +05:30
manoj	28a00cd21c	Email functionality	2015-03-20 16:17:51 +05:30
manoj	7c0ca194a1	Email functionality	2015-03-20 16:16:57 +05:30
manoj	78959f0cfb	user management	2015-03-20 14:21:04 +05:30
prabathabey	61073f0a4b	Committing operation management improvements	2015-03-20 14:03:03 +05:30
prabathabey	0e598aad59	Improving operation management implementation	2015-03-20 13:49:37 +05:30
manoj	d790d343a9	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java	2015-03-20 12:32:50 +05:30
manoj	b2d8f3f7f5	Email Management	2015-03-20 12:28:50 +05:30
manoj	34ad4a63a2	Email management	2015-03-20 12:27:45 +05:30
Dulitha Wijewantha	fc86ccd86d	* Setup the datasource for the operation manager dao factory ... * Implemented the get all devices and get devices for user * Added support for tenant domain in get devices for user (This has to be added to all methods)	2015-03-20 10:23:32 +05:30
Dulitha Wijewantha	4600968d60	* Re-added the method to convert a Device Property list to a Map	2015-03-19 11:17:18 +05:30
prabathabey	4638d25ff1	Code cleanup	2015-03-18 22:00:19 +05:30
manoj	58337a986d	Email functionality	2015-03-18 19:23:21 +05:30
manoj	e7d165d3b9	Email sending	2015-03-18 19:20:41 +05:30
manoj	232ef4bd90	merge with master	2015-03-18 19:10:09 +05:30
manoj	a41c1421e9	User list	2015-03-18 18:55:56 +05:30
prabathabey	19fbc11642	Restructuring the sources	2015-03-18 16:25:34 +05:30
prabathabey	3219a7cc41	Restructuring source code to be able to make it more maintenable	2015-03-18 15:47:31 +05:30
prabathabey	7056b01d18	Fixing more build issues	2015-03-18 10:25:38 +05:30
prabathabey	d5127f6874	Code cleanup and fixing build failures	2015-03-17 21:04:25 +05:30
prabathabey	3fb61d9c8b	Resolving more merge conflicts	2015-03-17 17:40:49 +05:30
prabathabey	8b5f491d69	Fixing merge conflicts	2015-03-17 17:37:11 +05:30
prabathabey	31b931537f	Adding operation and license management implementations	2015-03-17 17:30:30 +05:30
prabathabey	8662eb36e4	Adding operation manager related changes	2015-03-17 17:27:41 +05:30
inosh-perera	4754da70be	get all devices when the username is provided	2015-03-16 12:39:08 +05:30
Geeth Munasinghe	ac2fa547d4	[maven-release-plugin] prepare for next development iteration	2015-02-24 14:29:34 +05:30
Geeth Munasinghe	28a1bd9fde	[maven-release-plugin] prepare release v0.9.1	2015-02-24 14:29:25 +05:30
Geeth Munasinghe	1a550269f1	Changing the version to 0.9.1-SNAPSHOT	2015-02-24 14:24:16 +05:30
Geeth Munasinghe	835207a13d	[maven-release-plugin] prepare for next development iteration	2015-02-23 18:54:54 +05:30
Geeth Munasinghe	7933271193	[maven-release-plugin] prepare release v0.9.1	2015-02-23 18:54:44 +05:30
harshanL	021c27666c	Removed governance dependencies	2015-02-21 02:00:55 +05:30
prabathabey	b52f8d8697	Making LicenseManagement OSGi service use the existing LicenseManagerImpl	2015-02-20 14:59:51 +05:30
prabathabey	916760275f	Refactoring license management implementation	2015-02-19 17:24:50 +05:30
prabathabey	9ad8d6eab9	Refactoring License management functionality	2015-02-18 18:33:18 +05:30
prabathabey	a9a0ac5899	Fixing merge conflicts	2015-02-16 17:42:46 +05:30
prabathabey	8db95a349d	Improving License handling functionality	2015-02-16 17:41:10 +05:30
manoj	cd3913d43d	Remove Date Adaptor class	2015-02-13 19:43:47 +05:30
manoj	4d87e3f605	remove xml data adaptor	2015-02-13 15:01:42 +05:30
harshanL	1736d5db3e	CDMF-8 fixes	2015-02-12 18:32:06 +05:30
harshanL	98ac04479d	CDMF-6 fix	2015-02-10 18:28:18 +05:30
Geeth Munasinghe	05cee229d3	[maven-release-plugin] prepare for next development iteration	2015-02-09 17:45:18 +05:30
Geeth Munasinghe	ba12c63636	[maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2	2015-02-09 17:45:09 +05:30
Geeth Munasinghe	68f5cf6400	[maven-release-plugin] rollback the release of carbon-devicemgt-0.9.0-M2	2015-02-09 17:42:48 +05:30
Geeth Munasinghe	f0511a0b01	[maven-release-plugin] prepare for next development iteration	2015-02-09 17:41:29 +05:30
Geeth Munasinghe	5f72231731	[maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2	2015-02-09 17:41:21 +05:30
Geeth Munasinghe	13692f6355	[maven-release-plugin] rollback the release of carbon-devicemgt-0.9.0-M2	2015-02-09 15:02:25 +05:30
Geeth Munasinghe	3dd38392b1	[maven-release-plugin] prepare for next development iteration	2015-02-09 14:53:48 +05:30
Geeth Munasinghe	c6d993cee8	[maven-release-plugin] prepare release carbon-devicemgt-0.9.0-M2	2015-02-09 14:53:33 +05:30
Geeth Munasinghe	81d6a238c7	Changing the version to 0.9.0 and fixing some issues on poms	2015-02-09 14:51:57 +05:30
Geeth Munasinghe	f494143351	Separating the components from the product-cdm repository, all the commits will be survived.	2015-02-09 14:25:57 +05:30
Geeth Munasinghe	fb3e40bc2f	Merge branch 'master' of https://github.com/wso2/product-cdm	2015-02-09 12:07:16 +05:30
Geeth Munasinghe	8c5fd85484	Changing the version to 1.0.0-SNAPSHOT	2015-02-09 12:06:04 +05:30
Geeth Munasinghe	0fd9875342	[maven-release-plugin] prepare for next development iteration	2015-02-08 12:30:55 +05:30
Geeth Munasinghe	ab92119231	[maven-release-plugin] prepare release wso2cdm-1.0.0-M2	2015-02-08 12:30:44 +05:30
Geeth Munasinghe	3e8591cccd	Fixing issues in the pom for release purposes	2015-02-08 12:09:09 +05:30
Geeth Munasinghe	c3b26b3f1c	[maven-release-plugin] prepare for next development iteration	2015-02-08 11:58:59 +05:30
Geeth Munasinghe	12e49a0b1a	[maven-release-plugin] prepare release wso2cdm-1.0.0-M2	2015-02-08 11:58:49 +05:30
Geeth Munasinghe	4c30dfb9d8	[maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2	2015-02-08 11:54:54 +05:30
Geeth Munasinghe	aad4c8d244	[maven-release-plugin] prepare release wso2cdm-1.0.0-M2	2015-02-08 11:54:06 +05:30
manoj	815dc00344	Merge branch 'master' of https://github.com/wso2/product-cdm	2015-02-07 06:20:23 +05:30
manoj	4b81d04320	License Managment refactor	2015-02-07 06:14:20 +05:30
Geeth Munasinghe	17acce9458	[maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2	2015-02-06 20:32:24 +05:30
Geeth Munasinghe	5254511f5e	[maven-release-plugin] prepare release wso2cdm-1.0.0-M2	2015-02-06 20:31:01 +05:30
Geeth Munasinghe	84fbde538e	Fixing pom issues for release works	2015-02-06 20:27:32 +05:30
Geeth Munasinghe	c88ac79541	[maven-release-plugin] prepare for next development iteration	2015-02-05 19:22:54 +05:30
Geeth Munasinghe	8482d4cf27	[maven-release-plugin] prepare release wso2cdm-1.0.0-M2	2015-02-05 19:22:45 +05:30
Geeth Munasinghe	f67eee625a	Changing the version to 1.0.0-SNAPSHOT	2015-02-05 19:04:32 +05:30
Geeth Munasinghe	da9443a065	[maven-release-plugin] prepare for next development iteration	2015-02-05 16:56:52 +05:30
Geeth Munasinghe	7418cb8d4d	[maven-release-plugin] prepare release 1.1.0	2015-02-05 16:56:42 +05:30
Geeth Munasinghe	1942fd68b1	[maven-release-plugin] rollback the release of wso2cdm-parent-1.0.0	2015-02-05 16:50:24 +05:30
Geeth Munasinghe	ae4e56c9d6	[maven-release-plugin] prepare for next development iteration	2015-02-05 16:40:38 +05:30
Geeth Munasinghe	d57c56e36d	[maven-release-plugin] prepare release wso2cdm-parent-1.0.0	2015-02-05 16:40:26 +05:30
Geeth Munasinghe	02d1a259df	[maven-release-plugin] rollback the release of 1.0.0	2015-02-05 16:18:34 +05:30
Geeth Munasinghe	462e53070c	[maven-release-plugin] prepare for next development iteration	2015-02-05 15:58:47 +05:30
Geeth Munasinghe	0d81d60c99	[maven-release-plugin] prepare release 1.0.0	2015-02-05 15:58:37 +05:30
Geeth Munasinghe	ac609f9996	Changing the version to 1.0.0-SNAPSHOT	2015-02-05 14:55:27 +05:30
manoj	8cd5f6d61f	Default License ManagementY	2015-02-05 13:11:10 +05:30
manoj	394258d10f	Default License feature	2015-02-05 13:10:26 +05:30
manoj	b21676a639	components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java ... Default License feature	2015-02-05 13:09:48 +05:30
Geeth Munasinghe	e1b94822ab	[maven-release-plugin] prepare for next development iteration	2015-02-05 12:35:56 +05:30
Geeth Munasinghe	7f0558448e	[maven-release-plugin] prepare release 1.0.0	2015-02-05 12:35:47 +05:30
prabathabey	d6a22b06ff	Fixing more SNAPSHOT versions, used in carbon-governance, carbon-deployment related components	2015-02-02 21:13:52 +05:30
harshanL	d84a3c47d2	Removed private package declaration in device common bundle & added doc comments	2015-02-02 08:04:13 +05:30
prabathabey	5d9fb3b803	Refactoring the poms to remove SNAPSHOT versions of certain dependencies and test clean up	2015-01-31 18:49:56 +05:30
Geeth Munasinghe	f44b4597db	Fixing group ids of the pom files	2015-01-29 20:03:04 +05:30
manoj	66efd5d301	License Management Refactor	2015-01-27 23:45:45 +05:30
manoj	505b87a655	Merge remote-tracking branch 'upstream/master' ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java	2015-01-27 23:20:49 +05:30
manoj	428554cfe8	Unit test change to prepared statement	2015-01-27 21:51:28 +05:30
manoj	f907684a0b	license constants Refactor	2015-01-27 21:38:08 +05:30
manoj	2eadf11eaf	Refactor license constants	2015-01-27 21:37:23 +05:30
manoj	79261210f2	Refactor license constants	2015-01-27 21:35:14 +05:30
manoj	62f858d606	License Management Refactor	2015-01-27 21:28:04 +05:30
prabathabey	d439691a01	Fixing formatting issues	2015-01-27 20:27:16 +05:30
manoj	6e262cb60b	set active status for enroll device	2015-01-27 20:22:38 +05:30
Prabath Abeysekara	a4ffdf1aa5	Merge pull request #7 from manojgunayadev/master ... set active status for enroll device	2015-01-27 20:21:56 +05:30
manoj	60e539b583	set active status for enroll device	2015-01-27 20:20:42 +05:30
manoj	b56e42792a	set active status for enroll device	2015-01-27 20:18:15 +05:30
Dulitha Wijewantha	c8d510eea7	Merge branch 'master' of github.com:wso2/product-cdm	2015-01-23 22:03:24 +05:30
Dulitha Wijewantha	7f3516b2a6	* Added a description to the feature object ... * Added the COMMAND enum to the Operation class	2015-01-23 21:52:00 +05:30
prabathabey	4fd229357a	Enabling logging for test case implementations	2015-01-23 21:24:02 +05:30
Dulitha Wijewantha	9e68b5fdb8	Merge branch 'master' of github.com:wso2/product-cdm	2015-01-23 18:40:23 +05:30
manoj	10e97b3ae1	License Management	2015-01-23 18:32:21 +05:30
Geeth Munasinghe	7718a4cb84	Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master	2015-01-23 18:29:58 +05:30
Dulitha Wijewantha	277f0341b1	* Add device type to the feature ... * Added method to operation manager to get features by type * Added an exception for feature management	2015-01-23 18:29:28 +05:30
Geeth Munasinghe	5fed717491	Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master	2015-01-23 18:25:16 +05:30
manoj	0135051d84	License Management	2015-01-23 18:17:40 +05:30
Dulitha Wijewantha	49a46ca909	Fixed indentation	2015-01-23 12:46:35 +05:30
Dulitha Wijewantha	6f2053995d	Changed the Map implementations to List since Map implementations are not very well supported by CXF	2015-01-23 11:40:36 +05:30
manoj	87e272a823	Merge remote-tracking branch 'upstream/master'	2015-01-23 10:09:53 +05:30
manoj	f4e9f1f15b	License Management	2015-01-23 10:08:42 +05:30
manoj	0e96d82968	License Managemnt	2015-01-23 10:04:41 +05:30
Dulitha Wijewantha	5e68735625	Removed the exception. It has to be handled in a different layer	2015-01-22 22:06:37 +05:30
Dulitha Wijewantha	315603481d	Fixed line spacing issues	2015-01-22 21:51:40 +05:30
Dulitha Wijewantha	b870490ea3	Merge branch 'master' of github.com:wso2/product-cdm	2015-01-22 21:23:08 +05:30
Dulitha Wijewantha	a3dc5d07e5	* Commented cdm app copying ... * Implemented the getDevice() * Added documentation * Added a method to deviceDAO to get the device by a DeviceIdentifier	2015-01-22 21:14:35 +05:30
harshanL	793786f020	Added a new operation to the operation manager	2015-01-22 21:14:19 +05:30
Dulitha Wijewantha	773fba11bf	Merge branch 'master' of github.com:wso2/product-cdm	2015-01-22 09:41:50 +05:30
Dulitha Wijewantha	49c490a183	Merge branch 'master' of github.com:dulichan/product-cdm ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfig.java components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileDeviceOperationDAOImpl.java components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileOperationDAOImpl.java components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/util/MobileDeviceManagementDAOUtil.java components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidMobileOperationManager.java components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml product/modules/mobileservices/agents/windows/jax-rs/pom.xml product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml product/modules/p2-profile-gen/pom.xml	2015-01-22 09:41:03 +05:30
Geeth Munasinghe	462045eac9	Changing the version to 1.0.0	2015-01-21 20:14:04 +05:30
Dulitha Wijewantha	93a82676e3	* Created a utility js to hold the utility functions ... * Created the UI APIs for mobile * Fixed a bug and changed the implementation to work with the properties Map instead of the List * Changed method signature and implementation to accept DeviceType for the conversion * UI level changes and license headers	2015-01-21 17:08:12 +05:30
Dulitha Wijewantha	a195844042	Changed the properties implementation to a Map from List. Removed unnecessary utility methods. Changed the conversion util methods.	2015-01-21 16:55:37 +05:30
harshanL	eb0fd6dc31	Added operation support for Android	2015-01-21 12:29:06 +05:30
Geeth Munasinghe	23226cc48e	As discussed in the product counsil, creating a seperate product for device management framework, this will hold only the core fuctionalities of device management, If some one wants to use this for their device type, they have to use this and write the plugins, uis	2015-01-20 17:30:36 +05:30
harshanL	193eca9e2d	Added operation persistance logic & refactored the code	2015-01-20 11:44:31 +05:30
manoj	da0351ebcd	Change device type to device type Id	2015-01-20 07:37:39 +05:30
manoj	72a3df080b	Merge branch 'master' of https://github.com/geethkokila/product-cdm ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java product/pom.xml	2015-01-20 07:29:16 +05:30
manoj	aa50bf96ed	Add License Mgt	2015-01-19 21:39:06 +05:30
manoj	50a17eb33d	Refactor add new mobile service module to as parent to agent module	2015-01-19 21:38:41 +05:30
Dulitha Wijewantha	f340855916	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-19 17:59:01 +05:30
Dulitha Wijewantha	adebf34ff2	Refactored the device id to integer. ... Created method to convert dto.device to common.device Created a bulk method for conversion Implemented getAllDevices	2015-01-19 17:54:39 +05:30
Dulitha Wijewantha	250c48a258	Fixed an issue of DeviceType and DeviceIdentifier. Implemented the getDeviceType method	2015-01-19 14:32:10 +05:30
harshanL	771575c408	Fixed conflicts in merge	2015-01-19 09:24:52 +05:30
harshanL	207a51a269	Added license headers with changes	2015-01-19 09:20:53 +05:30
prabathabey	74b8a32be3	Fixing exception getting swallowed in activate method of the service component	2015-01-19 01:04:35 +05:30
prabathabey	043bfb7742	Code cleanup	2015-01-19 00:58:41 +05:30
prabathabey	07e3dc9644	Fixing exception getting swallowed in deactivate method of the service component	2015-01-19 00:53:42 +05:30
prabathabey	83c9ae42b5	Fixing NPE thrown at server startup as a result of APIManagerConfigurationService not being available while the JAX-RS services are registered as APIs	2015-01-19 00:48:19 +05:30
prabathabey	b7984c18b6	Code cleanup	2015-01-18 14:34:26 +05:30
prabathabey	29bfc6f09f	More code cleanups	2015-01-18 14:16:27 +05:30
prabathabey	5f242d6165	code cleanup	2015-01-18 13:57:36 +05:30
prabathabey	9e695ecc85	Adding test cases to test unregistering a device management service from the device management repository	2015-01-18 13:53:26 +05:30
prabathabey	233f9e8d1f	Renaming DeviceMgtDAOTestSuite.java to DeviceManagementDAOTests.java	2015-01-18 13:27:23 +05:30
prabathabey	daa13e3732	Fixing licensing headers	2015-01-18 13:25:32 +05:30
prabathabey	2b1a5dd6c4	code cleanup	2015-01-18 12:58:14 +05:30
prabathabey	f2a80d3ede	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-18 12:46:55 +05:30
prabathabey	a31767d114	Adding test cases for device repository handling and device management config initialization	2015-01-18 12:46:14 +05:30
inosh-perera	40ee310f42	returning auto incremented id	2015-01-16 20:14:48 +05:30
harshanL	92503ac0fe	Added CDM-REST APIs	2015-01-16 17:52:31 +05:30
manoj	7feb390cef	Add governance and registry features	2015-01-15 10:59:56 +05:30
manoj	d0603f3e0b	Merge branch 'master' of https://github.com/geethkokila/product-cdm ... Conflicts: product/modules/p2-profile-gen/pom.xml	2015-01-14 18:42:47 +05:30
prabathabey	2871af5c38	cleaning up poms, removing unused dependencies from pom, declaring missing dependencies	2015-01-14 15:09:40 +05:30
manoj	b2f89320f7	Android JAX RS Refactor	2015-01-13 10:59:10 +05:30
manoj	1db2b40790	Android Services Refactor	2015-01-13 10:43:59 +05:30
prabathabey	aa7d4e4eba	Fixing API config initialization issues	2015-01-12 00:11:03 +05:30
prabathabey	717fa6dea8	Restructuring plugin config hierarchy	2015-01-11 23:58:12 +05:30
prabathabey	72dfc1ea14	Fixing more server start-up issues caused by not having proper package exports configured in org.wso2.carbon.device.mgt.mobile.impl as well as not having application-authentication.xml copied into CDM_HOME/repository/conf/security directory	2015-01-11 22:23:24 +05:30
inosh-perera	f2c6eab6a3	OperationDAO, FeaturePropertyDAO, OperationProperty and related implementaions	2015-01-09 10:41:06 +05:30
inosh-perera	1c2ede6be5	adding FeaturePropertyDAO and related implementation classes	2015-01-07 09:43:00 +05:30
prabathabey	d015b9a960	Pom cleanup	2015-01-06 22:00:36 +05:30
inosh-perera	d51669539a	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-06 20:46:35 +05:30
prabathabey	da792f96d8	Enabling surefire plugin	2015-01-06 19:44:01 +05:30
prabathabey	03e9bd341e	Code cleanup	2015-01-06 19:38:55 +05:30
inosh-perera	4f16f32269	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-06 18:59:23 +05:30
inosh-perera	f103b73367	adding featureDAO classes and unit tests	2015-01-06 18:58:03 +05:30
Geeth Munasinghe	ff859eaf19	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-06 10:08:36 +05:30
manoj	f01f822f6f	Refactor Device Management service exception class	2015-01-05 15:32:02 +05:30
manoj	704afe78ae	Delete test classes	2015-01-05 15:31:47 +05:30
inosh-perera	8c613539cc	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-05 14:48:41 +05:30
Geeth Munasinghe	0dd8009471	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-05 10:00:13 +05:30
manoj	0ba84713cd	Correct copy right text and refactor	2015-01-05 02:25:08 +05:30
Geeth Munasinghe	9bddb9407b	Fixing pom issues	2014-12-23 15:03:40 +05:30
manoj	acf33bdbe4	JAX RS Refractor	2014-12-22 20:55:18 +05:30
prabathabey	a6dd8875b5	Fixing build issues	2014-12-22 18:19:20 +05:30
prabathabey	b5eb0f0eb8	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-22 18:16:07 +05:30
prabathabey	982bd830bc	adding mobile operations related abstractions	2014-12-22 18:15:52 +05:30
harshanL	87d47c1d93	Refactored code comments	2014-12-22 16:55:11 +05:30
harshanL	0cd90fc349	Added device type to DB when registering the plugin	2014-12-22 16:47:32 +05:30
inosh-perera	72daca5ebd	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-22 14:24:49 +05:30
prabathabey	7f089b2a30	fixing packaging structure of mobile impl module and adding operations manager related interfaces	2014-12-22 14:22:25 +05:30
inosh-perera	b8152d8abe	chnaged the version of wso2 carbon dependance	2014-12-22 12:56:36 +05:30
prabathabey	f3a73b453e	removing obselete module out of the parent pom of device-mgt component	2014-12-22 11:19:53 +05:30
prabathabey	fea3486084	adding API Everywhere related changes to device-mgt component	2014-12-22 11:12:07 +05:30
harshanL	e60e7b6d7f	Fixed issues in Android JAX-RS app	2014-12-18 17:07:10 +05:30
harshanL	0ad9d1bd16	Added device type insert query to h2 database script	2014-12-18 10:52:51 +05:30
harshanL	9ba2c0198c	Fixed issues in enrollment process	2014-12-17 18:33:22 +05:30
harshanL	ad10426c11	Added mobile device management service with db schema	2014-12-17 15:43:31 +05:30
manoj	3ee767f1b2	merge after JAX-RS changes	2014-12-16 16:53:46 +05:30
manoj	37a47ec347	JAX-RS Refractor	2014-12-16 15:13:09 +05:30
prabathabey	674735d9db	code cleanup	2014-12-15 21:06:51 +05:30
prabathabey	f563e1f448	Fixing merge conflicts	2014-12-15 20:55:14 +05:30
prabathabey	a69fc9dc4c	Fixing issues spotted as a result of the bundle getting activated before the datasources used underneath are registered in JNDI	2014-12-15 20:52:38 +05:30
harshanL	95f72f77f1	Commented MobileActivator jndi lookup code	2014-12-15 20:20:11 +05:30
harshanL	4a419f3ebf	Added mobile device management related db classes	2014-12-15 20:09:39 +05:30
harshanL	a5018afadf	Making the plugin resolution optional for the core component	2014-12-15 18:43:56 +05:30
manoj	8fa2f38f37	remove EMM DB scripts file	2014-12-15 11:23:06 +05:30
prabathabey	0543d71f6b	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-15 09:57:39 +05:30
prabathabey	0acf34ae51	Fixing DAOFactory initialzation related issues	2014-12-15 09:57:24 +05:30
harshanL	9f5fb3fb91	Added MobileDeviceDAO classes	2014-12-15 09:47:54 +05:30
harshanL	006b07b399	Fixed issues in build & added COPE to enum	2014-12-15 09:41:54 +05:30
manoj	aa2448dd0a	Add device list method and chgange getDevice by Id method return type to device	2014-12-12 20:00:57 +05:30
manoj	18083d2d11	DAO unit tests implementation	2014-12-12 19:56:19 +05:30
manoj	10a05b024f	Device DAO unit tests implementation	2014-12-12 19:55:41 +05:30
manoj	8ad13b6d0a	Implement DAO unit tests	2014-12-12 17:22:16 +05:30
manoj	c4e2722586	Unit test framework for DAO tests	2014-12-12 17:21:27 +05:30
harshanL	80334ef00d	Added new APIs to enrollment	2014-12-11 17:22:32 +05:30
harshanL	6d5ea7f586	Added JSON to Device object conversion	2014-12-11 15:21:18 +05:30
prabathabey	f50e9cebdb	Fixing issues in reading the SQL script associated with CDM related functionalities	2014-12-10 18:07:01 +05:30
prabathabey	f321b133b8	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-10 17:54:10 +05:30
prabathabey	c199f6fe69	Renaming MobileDeviceManagementServiceComponent.java as MobileDeviceManagementBundleActivator.java and adding missing Bundle-Activator header in org.wso2.carbon.device.mgt.mobile.impl pom	2014-12-10 17:53:54 +05:30
harshanL	9697c1fa99	Added comments to the DeviceManagerService interface	2014-12-10 17:10:12 +05:30
harshanL	7c7768101f	Modified Android enrollment APIs and changed isRegistered to isEnrolled	2014-12-10 14:53:15 +05:30
harshanL	d09b37b4ce	merged changes to master	2014-12-09 20:45:37 +05:30
harshanL	c2f5d79b9c	Added Android-REST API implementation changes	2014-12-09 20:37:47 +05:30
prabathabey	441a135acb	Cleaning up constants	2014-12-09 20:28:11 +05:30
prabathabey	1476036b89	cleaning up constants	2014-12-09 17:56:24 +05:30
harshanL	1d94f81ec6	Merge branch 'master' of https://github.com/geethkokila/product-cdm ... Conflicts: components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/Device.java	2014-12-09 17:37:32 +05:30
harshanL	18f858ab3a	Added updateDeviceInfo method to DeviceManagerService.	2014-12-09 17:31:27 +05:30
harshanL	4b22589796	Modified DeviceManagerService to return operation status.	2014-12-09 17:30:37 +05:30
prabathabey	81dd70bb6c	cleaning up DAO layer	2014-12-09 16:56:32 +05:30
prabathabey	ee030e136d	Renaming deviceMgt-config.xml as cdm-config.xml	2014-12-08 20:47:23 +05:30
prabathabey	278240b02f	Bridging DeviceManagement core functionalities together with the persistence layer	2014-12-08 20:39:35 +05:30
prabathabey	fce61a59e2	Fixing DeviceManagementRepository initialization related issues	2014-12-08 19:53:01 +05:30
prabathabey	fdd7ca9032	code cleanup	2014-12-08 19:50:11 +05:30
prabathabey	451c38457f	code cleanup	2014-12-08 19:22:06 +05:30
prabathabey	e40e836cd4	fixing issues in license headers	2014-12-08 19:00:38 +05:30
prabathabey	a6e9a9834e	code cleanup	2014-12-08 18:58:25 +05:30
prabathabey	6db26d9e64	fixing merge conflicts	2014-12-08 18:55:04 +05:30
prabathabey	19256e2638	Impproving the DAO layer, DeviceManagerService SPIs and implmenting initial bits of plugin management	2014-12-08 18:52:26 +05:30
manoj	76e103ef00	DAO Layer Implementation	2014-12-08 17:34:09 +05:30
manoj	3a7bef2170	DAO Implementation Layer	2014-12-08 17:24:29 +05:30
Geeth Munasinghe	33812ec50f	Changing the new test frame work to testng	2014-12-08 16:31:10 +05:30
Geeth Munasinghe	eb734a4b14	Changing the policy interface and test case	2014-12-08 15:42:59 +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	0b4a6196e0	DAO Layer Implementation	2014-12-08 15:12:07 +05:30
manoj	5216373b97	DAO Layer implementation	2014-12-08 15:11:01 +05:30
manoj	630c065d4e	DAO Layer Implementation	2014-12-08 15:09:30 +05:30
manoj	f37df2e6b7	DAO Layer Implementation	2014-12-08 15:08:31 +05:30
manoj	23938f5e0b	DAO Layer Impelementation ... Conflicts: pom.xml	2014-12-08 15:06:56 +05:30
Geeth Munasinghe	d24030dd74	Fixing the compilation failure	2014-12-05 15:10:52 +05:30
Geeth Munasinghe	2c370acfa9	Fixing the compilation failure	2014-12-05 15:09:21 +05:30
Geeth Munasinghe	28a2cec615	adding the test case class, no implementation is done	2014-12-05 14:41:43 +05:30
Geeth Munasinghe	7b30fc9642	Fixing mobile implementations	2014-12-05 13:49:01 +05:30
prabathabey	a7ff8a954c	Making all the implementations of DeviceManagerService interface compatible with the changes introduced into the same	2014-12-05 13:33:21 +05:30
prabathabey	ef95ac4621	Making all the implementations of DeviceManagerService interface compatible with the changes introduced into the same	2014-12-05 13:28:32 +05:30
prabathabey	983ca1562f	Introducing DeviceIdentifier bean wrapping id and the type of a particular device. This includes other formatting related improvments too brought up during the code reviews	2014-12-05 13:26:42 +05:30
manoj	dc8837a1da	DAO Layer Implementation	2014-12-05 12:33:08 +05:30
manoj	a9bd0ea8c6	DAO Layer Implementation	2014-12-05 12:30:34 +05:30
harshanL	e656ec54f6	Merge remote-tracking branch 'origin/master'	2014-12-05 11:39:38 +05:30
harshanL	d5d332e91c	Added updateDeviceInfo method to DeviceManagerService.	2014-12-05 11:39:19 +05:30
manoj	6e77014e64	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-05 11:11:48 +05:30
manoj	ea92bc904a	DAO Layer Implementation	2014-12-05 11:11:23 +05:30
manoj	fd55faaf2e	DAO Layer Implementation	2014-12-05 11:09:46 +05:30
manoj	1e6d06027d	DAO Layer Implementation	2014-12-05 11:04:16 +05:30
manoj	a3028b0683	DAO Layer Implementation	2014-12-05 11:03:28 +05:30
prabathabey	7ebb6fba4d	Fixing mobile related implementations of DeviceManagerService SPI to be able to support newly added getProviderType method	2014-12-04 18:29:59 +05:30
prabathabey	8ebf7a6ae9	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-04 18:20:36 +05:30
prabathabey	6e9366bfbf	Adding SCR plugin info	2014-12-04 18:20:17 +05:30
prabathabey	1ed02a5c01	Adding an interface method "getProviderType" to identify a particular implementation of DeviceManagerService and pom cleanup	2014-12-04 18:18:30 +05:30
harshanL	843322d33f	Added service registrations to Mobile DeviceManagerService component .	2014-12-04 17:12:55 +05:30
harshanL	d23da5e215	Added Mobile DeviceManagerService component.	2014-12-04 14:51:25 +05:30
harshanL	db95056952	Added Mobile-platform specific DeviceManagerService implementations.	2014-12-04 14:45:02 +05:30
prabathabey	6bd0f82e2c	adding mobile plugin implementation related modules	2014-12-04 13:57:48 +05:30
prabathabey	460e1521ff	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-04 11:55:09 +05:30
prabathabey	169c9db89b	code cleanup	2014-12-04 11:48:59 +05:30
manoj	19d4d1f62d	DAO Layer Implementation	2014-12-04 11:38:19 +05:30
manoj	2ad0e441e8	DAO Layer Implementation	2014-12-04 11:19:17 +05:30
manoj	22bf18666f	DAO Layer implementation	2014-12-04 11:18:18 +05:30
prabathabey	08b78cff13	further cleaning up SPIs	2014-12-04 10:36:14 +05:30
prabathabey	6e8559545d	Cleaning up SPIs	2014-12-04 10:06:41 +05:30
prabathabey	3ebb14acdd	Adding initial key SPIs and other related dependencies	2014-12-04 10:00:37 +05:30
Niranjan-K	e98fc6c48d	Changed carbon version to 4.3.0-SNAPSHOT	2014-12-03 17:42:16 +05:30
Niranjan-K	aec835fc8a	Removed patches from bin.xml	2014-12-03 16:45:36 +05:30
prabathabey	2b6a58b75e	Refactoring the packaging structure	2014-12-03 15:49:23 +05:30
Geeth Munasinghe	0c724855df	Fixing the version of the device core	2014-12-03 15:31:14 +05:30
Geeth Munasinghe	3c98bf1dd7	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-03 15:27:49 +05:30
Geeth Munasinghe	87972270a6	Fixing version of the components	2014-12-03 15:27:38 +05:30
prabathabey	2a1f6d38fe	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2014-12-03 15:20:48 +05:30
prabathabey	62ce7444fb	cleaning up poms	2014-12-03 15:19:48 +05:30
Geeth Munasinghe	2b25d2bd2c	Fixing pom issues	2014-12-03 15:19:07 +05:30
Geeth Munasinghe	1e77daa589	Fixing pom issues	2014-12-03 15:06:50 +05:30
prabathabey	4e454c7b2a	committing device-mgt initial component structure	2014-12-03 14:54:57 +05:30