579 Commits

Author	SHA1	Message	Date
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	fa2f61f48a	Add missing parts in group management	2016-03-29 12:41:38 +05:30
ayyoob	c45895685b	Added device type multi tenancy capability.	2016-03-29 11:40:58 +05:30
prabathabey	5e7985dae6	merging group-mgt implementation	2016-03-27 16:01:06 +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	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
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
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