677 Commits

Author	SHA1	Message	Date
geethkokila	e2d67fc92c	Adding the changes for device search	2016-05-02 14:36:14 +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	68361f01ed	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-29 12:30:00 +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
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
geethkokila	4029c86da4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 10:26:51 +05:30
geethkokila	2fb42518b6	Adding the changes for the device group with policy.	2016-04-27 10:26:47 +05:30
prabathabey	f5f177a858	Wrapping all device provisioning related info in ProvisioningConfig	2016-04-26 17:16:48 +05:30
prabathabey	95d3b97c5f	Code cleanup	2016-04-26 15:59:22 +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
charithag	3dc23c5708	Fixing UI and implementation issues occurred after restructuring.	2016-04-07 20:41:10 +05:30
charithag	905f9ae4c1	Fixing UI issues occured after restructuring.	2016-04-07 11:55:48 +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
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	81ae512f13	Merge pull request #6 from ayyoob/merge-devicetype ... merge device type	2016-03-30 12:20:02 +05:30
charithag	0a8e00fd1e	Merged with upstream and resolved conflicts.	2016-03-30 02:00:47 +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
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	12c4ba10af	Code cleanup	2016-03-27 16:04:15 +05:30
prabathabey	5e7985dae6	merging group-mgt implementation	2016-03-27 16:01:06 +05:30