2332 Commits

Author	SHA1	Message	Date
Megala	f9204add08	Merge remote-tracking branch 'upstream/master'	2016-10-05 10:10:12 +05:30
Megala	42a9ba92a6	Fixing EMM-1683	2016-10-05 10:09:35 +05:30
Megala	b7990b9146	Fixing problems in retriveing data from secondary user store	2016-10-04 17:22:45 +05:30
Kamidu Sachith Punchihewa	c7bd0de033	Merge pull request #369 from thusithak/master ... Platform configuration style defect fixes	2016-10-04 17:09:53 +05:30
Dilan U. Ariyaratne	2d7506d9b8	Merge pull request #368 from amalhub/master ... Fixing issue: EMM-1537	2016-10-04 17:04:55 +05:30
dilanua	dff32af832	Adding initial swagger annotations and permissions to Dashboard APIs	2016-10-04 16:25:17 +05:30
dilanua	1ca5762c44	Uncommenting Dashboard APIs	2016-10-04 15:49:29 +05:30
thusithakalugamage	f664749c1f	platform configuration style defect fixes	2016-10-04 15:22:41 +05:30
amalhub	c87c5a8322	Fixing issue: EMM-1537	2016-10-04 11:14:39 +05:30
harshanl	f0f0182d20	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-10-03 18:28:43 +05:30
harshanl	a4538a6d6c	Removed unnecessary params from paginated queries	2016-10-03 18:27:20 +05:30
Rasika Perera	35c23174be	Fixing android sense download issue	2016-10-03 16:05:49 +05:30
Rasika Perera	0290c710e1	Fixing enrollment url for device types	2016-10-03 16:05:49 +05:30
Harshan Liyanage	13d9bdfb53	Merge pull request #367 from Megala21/master ... [EMM-1129]Fixing SSO problem	2016-10-03 15:42:13 +05:30
Megala	359bd8f317	Fixing tenant loading problem	2016-10-03 15:15:27 +05:30
harshanl	672de3a09e	Device status change fix for iOS	2016-10-03 14:57:46 +05:30
Megala	e8eb0123c7	Fixing the tenant loading problem when sso is enabled	2016-10-03 14:18:43 +05:30
harshanl	befb5b0ad8	EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.	2016-10-03 14:13:06 +05:30
amalhub	8b4649b4e5	Fixing issue: EMM-1537	2016-10-03 11:39:03 +05:30
Megala	a0586ca977	Adding comment	2016-10-03 11:34:00 +05:30
Megala	e5870e1306	Fixing the problem of common log out	2016-10-02 23:15:25 +05:30
Megala	b10c323582	Fixing the problem in login	2016-10-02 21:26:13 +05:30
Megala	bacd7ccfd2	Merge remote-tracking branch 'upstream/master'	2016-10-01 22:02:35 +05:30
Megala	4af2a37d9d	Fixing SSO problem	2016-10-01 22:00:59 +05:30
harshanl	406d49ad61	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-30 18:43:38 +05:30
harshanl	399ef2fc06	Windows getOpending operations fix	2016-09-30 15:33:59 +05:30
kamidu	5595100cc2	UI fixes in role and policy management	2016-09-30 15:10:34 +05:30
harshanl	9d31590e83	Windows getPending operations fix	2016-09-30 14:27:11 +05:30
harshanl	10f8b12b88	OperationManagerImpl Code refactored	2016-09-30 11:39:15 +05:30
harshanl	f9ba45f439	Fixed the device status changing issue when there are multiple enrollments for the same device	2016-09-30 11:04:28 +05:30
harshanl	b1e140b58e	Removed unnecessary imports	2016-09-30 10:58:00 +05:30
Chatura Dilan Perera	c16cc4cae1	[maven-release-plugin] prepare for next development iteration	2016-09-29 20:33:07 +05:30
Chatura Dilan Perera	ed4bca7032	[maven-release-plugin] prepare release v1.2.2	2016-09-29 20:32:59 +05:30
warunalakshitha	25ed0cf370	Fix build issue with swagger version	2016-09-29 18:28:09 +05:30
Rasika Perera	3b68ccb4ba	Merge pull request #365 from rasika/iots-ga ... Merge iot-ga branch	2016-09-29 15:21:17 +05:30
Megala	400199e965	Merge remote-tracking branch 'upstream/master'	2016-09-29 14:18:24 +05:30
Megala	38677f84e8	Fixing SQL syntax problem	2016-09-29 14:09:44 +05:30
Harshan Liyanage	cd06637546	Merge pull request #364 from Megala21/master ... Correcting the problem related with oracle syntax	2016-09-29 14:06:49 +05:30
Megala	12aed521e5	Refactoring code	2016-09-29 13:57:06 +05:30
Megala	2cdaf5aa21	Reverting changes made to generic implementations and moving them to oracle specific ones	2016-09-29 13:44:33 +05:30
Megala	ecc87f370c	Fixing oracle error	2016-09-29 13:19:33 +05:30
Rasika Perera	b2eb715fb7	REsolving conflicts	2016-09-29 13:01:01 +05:30
Rasika Perera	5c8c28d28c	Merge pull request #1 from warunalakshitha/master ... upgrade product iot to carbon 4.4.9	2016-09-29 11:24:05 +05:30
charitha	e6c4053135	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-09-29 11:12:52 +05:30
charitha	da0977bd85	Fix SQL error when could happen due to large response payloads	2016-09-29 11:12:28 +05:30
Megala	47d6268c9e	Correcting the problem related with oracle syntax	2016-09-29 01:43:33 +05:30
warunalakshitha	397c1daa2a	Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle	2016-09-29 00:40:58 +05:30
Rasika Perera	237b9a7078	Creating api endpoint to retrieve features of a device-type	2016-09-28 23:42:44 +05:30
Rasika Perera	b2f31be1d6	Fixing iot operation bar not listing operations	2016-09-28 23:42:15 +05:30
Megala	cd50fe88bc	Reformatting the code	2016-09-28 16:22:59 +05:30