2310 Commits

Author	SHA1	Message	Date
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
Megala	45cda92082	Merge remote-tracking branch 'upstream/master'	2016-09-28 15:33:42 +05:30
Megala	82be4ef5a8	Fixing oracle script issues	2016-09-28 15:15:24 +05:30
dilanua	7596f7876d	Improving device view info.retrieval - UI	2016-09-28 14:11:00 +05:30
Rasika Perera	6d4ddf7b54	Removed info log on view device	2016-09-27 23:19:14 +05:30
Rasika Perera	1bae3d2213	Fixing policy retrieve api	2016-09-27 22:06:48 +05:30
Rasika Perera	99fee36f2c	Fixing error when properties is null	2016-09-27 21:13:00 +05:30
amalhub	428ce25b6f	Fixing issue: https://wso2.org/jira/browse/EMM-1646	2016-09-27 20:46:00 +05:30
harshanl	9467efe0f6	Fixed notification issue	2016-09-27 17:54:31 +05:30
kamidu	1a9ca2d59e	Fix for Jira issue: EMM-1635	2016-09-27 15:41:47 +05:30
Rasika Perera	12c8483b4b	Changes to devices policy	2016-09-27 15:28:06 +05:30
kamidu	174555b387	Fix for EMM-1627	2016-09-27 11:29:34 +05:30
Rasika Perera	056f6d2f4e	Adding proper error message when no device type is avaialble	2016-09-27 04:49:07 +05:30
Imesh Chandrasiri	de63beaaa6	Roles listing icon resize fix	2016-09-26 20:04:14 +05:30
Imesh Chandrasiri	5e7d3a00ad	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-26 20:02:44 +05:30
dilanua	8232bf7484	FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633	2016-09-26 19:52:18 +05:30
Imesh Chandrasiri	5954fd9070	EMM-1595 : Fixing Icon of Users get enlarged when sorting by user name in List Mode	2016-09-26 19:41:20 +05:30
Imesh Chandrasiri	2c0df21491	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration	2016-09-26 19:37:43 +05:30
Rasika Perera	56a81e431c	Removed extra license headers	2016-09-26 19:21:46 +05:30
Rasika Perera	6bfe166b5d	Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username	2016-09-26 19:17:05 +05:30
Rasika Perera	54c518a4fd	Making datatables-extended to get context path from global js variable	2016-09-26 19:13:12 +05:30
Rasika Perera	77720dd61a	Fixing devices listing page styling issue.	2016-09-26 18:25:11 +05:30
Rasika Perera	1bef7a38ef	Minor style fix for wr-hidden-operations	2016-09-26 18:08:06 +05:30