1333 Commits

Author	SHA1	Message	Date
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