271 Commits

Author	SHA1	Message	Date
Imesh Chandrasiri	c92fbc6b0f	modal code changes	2016-09-09 11:44:06 +05:30
Imesh Chandrasiri	bbe9dfecd2	adding modal changes	2016-09-09 10:44:04 +05:30
kamidu	dcc062faad	Device management theam changed to follow the patten introdused in policy management	2016-08-23 17:19:41 +05:30
dilanua	fb30118aa2	Adding supported feature: DEVICE_UNLOCK entry to db	2016-08-22 16:30:32 +05:30
hasuniea	3a25572fda	fixing EMM-1509 issue	2016-08-22 10:51:35 +05:30
hasuniea	d5297cf36e	fixing empty device enrollment body exception	2016-08-19 19:40:23 +05:30
Chatura Dilan Perera	ca2e631076	Fix conflicts	2016-08-19 15:25:51 +05:30
Chatura Dilan Perera	7ff9204646	[maven-release-plugin] prepare for next development iteration	2016-08-18 22:52:56 +05:30
Chatura Dilan Perera	5e43c5bef9	[maven-release-plugin] prepare release v2.1.2	2016-08-18 22:52:47 +05:30
harshanl	a844573773	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-08-18 19:45:52 +05:30
dilanua	21eacedf8b	Suppressing checked warnings	2016-08-18 16:04:46 +05:30
harshanl	d0512f93b7	Fixed EMM-1282	2016-08-18 11:06:43 +05:30
Chatura Dilan	76f14c13ab	Merge pull request #317 from charithag/carbon-kernel-4.4.3 ... Fix for possible NPE that could happen due to null device or null pro…	2016-08-17 16:00:12 +05:30
charitha	2f2af6c46b	Change indentations to tab as this file use tab indentations	2016-08-17 15:58:32 +05:30
charitha	8ba69c8b36	Change indentations to tab as this file use tab indentations	2016-08-17 15:58:02 +05:30
charitha	76a442e864	Fix for possible NPE that could happen due to null device or null property list.	2016-08-17 15:54:56 +05:30
hasuniea	5e2a42d798	fixing app-install issue	2016-08-17 15:31:18 +05:30
kamidu	33c490e229	adding missing units	2016-08-16 17:13:29 +05:30
kamidu	2486c3ff5d	remove tables headers when there is no enroll devices in the system	2016-08-16 14:55:15 +05:30
Rasika Perera	c8e7ba4f54	Placeholders added to send notification form input elements	2016-08-16 12:23:29 +05:30
Rasika Perera	de786ee8c0	License updated for qr modal unit	2016-08-16 12:23:03 +05:30
Rasika Perera	a55e9a53ae	Removed hardcoded app context on href links	2016-08-16 12:15:52 +05:30
Rasika Perera	784c2260e4	qr modal added to devices listing page	2016-08-16 12:15:52 +05:30
Rasika Perera	75b67a02bc	qr modal added	2016-08-16 12:15:52 +05:30
Rasika Perera	e1071ef8f3	Reusable qr modal unit created	2016-08-16 12:15:52 +05:30
Rasika Perera	fe01c59ed4	Fixing notification send operation not sending notifications	2016-08-15 23:03:58 +05:30
hasuniea	0504f34e22	Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3	2016-08-15 21:03:26 +05:30
dilanua	fcd68eab59	Fixing owner undefined issue in device view	2016-08-15 18:37:51 +05:30
kamidu	3262a7d926	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-08-15 18:17:14 +05:30
kamidu	7cb4f51dd2	Fix the device location view isssues	2016-08-15 18:07:52 +05:30
kamidu	b8d91478d5	Device view and detail related ui fixes	2016-08-15 18:06:19 +05:30
mharindu	caf73209b9	Removed unrelevant changes	2016-08-15 15:58:58 +05:30
mharindu	695fdc1cad	Fixed confusing error messages issue	2016-08-15 15:54:04 +05:30
mharindu	150f569d05	Fixed json parsing issue in android agent	2016-08-15 15:48:31 +05:30
hasuniea	8a9114dd88	removing vpn validatiion property	2016-08-15 12:36:32 +05:30
hasuniea	72dd424c09	fixing jira issue related blacklisted application	2016-08-15 12:33:04 +05:30
hasuniea	71e64ae672	fixing put configuration	2016-08-15 12:32:19 +05:30
dilanua	3cc2a8ca12	Fixing role retrieval issue in policy-mgt	2016-08-15 12:01:42 +05:30
ayyoob	9978452cca	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com	2016-08-13 10:50:06 +05:30
ayyoob	255e6b5566	few changes to resolve after scope validation issue	2016-08-13 10:38:30 +05:30
kamidu	c5bb85e772	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-08-12 17:40:49 +05:30
kamidu	ad5b871a30	Fix the device view zone conflict	2016-08-12 17:40:42 +05:30
hasuniea	68f64c3ae1	adding windows devicemgt interface and impl	2016-08-12 16:31:47 +05:30
hasuniea	33bcfc62c5	removing vpn validatiion property	2016-08-12 16:30:34 +05:30
hasuniea	22ec736841	fixing log throwing issue for internal server error(500)	2016-08-12 16:14:40 +05:30
hasuniea	66813f7d40	fixing jira issue related blacklisted application	2016-08-12 16:01:49 +05:30
kamidu	f17261423f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-08-12 14:32:28 +05:30
kamidu	96503f8166	Fix the notification related issues in mdm.nav bar	2016-08-12 14:09:08 +05:30
ayyoob	2555a91b4d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com	2016-08-12 14:01:09 +05:30
ayyoob	65ca57c6d5	added scope annotation	2016-08-12 12:27:03 +05:30