2701 Commits

Author	SHA1	Message	Date
Supun94	3d6f5ee64d	Changing policy compliance view	2016-12-19 16:19:36 +05:30
Supun94	09572a9977	Removed redundant classes	2016-12-19 16:19:36 +05:30
Supun94	89410dfae4	Changing getEffectiveFeatures method	2016-12-19 16:19:36 +05:30
Supun94	d82a70f841	Changing simple policy decision point	2016-12-19 16:19:36 +05:30
Supun94	2751d4b856	Code refactoring	2016-12-19 16:19:36 +05:30
Supun94	eb1575126f	Minor refactoring on policy merging	2016-12-19 16:19:36 +05:30
Supun94	451b2fd1dc	Minor refactoring on policy evaluation	2016-12-19 16:19:36 +05:30
Supun94	02fb952cc0	Minor refactoring on policy decision point	2016-12-19 16:19:36 +05:30
Supun94	35f3fcc8f9	Changed policy evaluation point	2016-12-19 16:19:36 +05:30
Supun94	62acc2ebf2	Adding merged policy evaluation service component	2016-12-19 16:19:36 +05:30
Supun94	6565e14051	Adding simple policy evaluation decision point	2016-12-19 16:19:36 +05:30
Supun94	936e71a743	Adding configurations for different policy evaluation service components	2016-12-19 16:19:36 +05:30
Supun94	272ba7b012	Changed getEffectiveFeatures method	2016-12-19 16:19:36 +05:30
Supun94	367fa927b0	Changed policy decision point package structure	2016-12-19 16:19:36 +05:30
Supun94	652d776672	Adding effective policy details	2016-12-19 16:19:36 +05:30
Supun94	5a1c73b119	Adding cdmf effective policy unit	2016-12-19 16:19:36 +05:30
Supun94	2847ff2095	Adding cdmf effective policy page	2016-12-19 16:19:36 +05:30
Supun94	33b79dcbba	Adding effective policy service	2016-12-19 16:19:36 +05:30
Supun94	c91da9219d	fixed policy conflicts	2016-12-19 16:19:36 +05:30
Supun94	cc5d9012c1	Created simple evaluation point	2016-12-19 16:19:36 +05:30
Supun94	21bc812281	Minor refactoring on Policy Eval service comp	2016-12-19 16:19:36 +05:30
charitha	7acbc5cd0b	Moved qr modal to device mgt core	2016-12-19 15:25:06 +05:30
Charitha Goonetilleke	f4b3313ad7	Merge pull request #491 from DimalChandrasiri/release-2.0.x ... UI update on email invites	2016-12-19 13:42:43 +05:30
Charitha Goonetilleke	8216ea3a79	Merge pull request #488 from madawas/IOTS-296 ... Fixing generic policy saving issues	2016-12-19 13:41:39 +05:30
Rasika Perera	1465c56822	Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4" ... This reverts commit f9b6939cb7.	2016-12-19 12:39:56 +05:30
Imesh Chandrasiri	765f97f5a0	email invite sender changes	2016-12-19 11:27:01 +05:30
Imesh Chandrasiri	e696b5bd0c	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-19 11:02:57 +05:30
WSO2 Builder	f9b6939cb7	[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4	2016-12-19 09:06:04 +05:30
Rasika Perera	42930fe8c4	Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4" ... This reverts commit 78b9052c37.	2016-12-19 08:45:19 +05:30
Harshan Liyanage	a2a03a523e	Refactored RoleMgtServiceImpl.	2016-12-16 19:46:14 +05:30
Harshan Liyanage	de2f85de2e	IOTS-337:Fixed permission remove issue when updating role permissions.	2016-12-16 19:30:41 +05:30
WSO2 Builder	78b9052c37	[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4	2016-12-16 17:03:06 +05:30
Imesh Chandrasiri	f70be13bf2	Common unit for email invite modal for devices screens	2016-12-16 14:53:51 +05:30
Megala	d4e9c43ff1	Fixing race condition in creating and subscribing application in api-manager side	2016-12-16 14:13:40 +05:30
Madawa Soysa	5b1a68280c	Moving codemirror to a lib unit ... This commit moves the codemirror library and modes to a lib unit and reuse the unit when necessary.	2016-12-16 10:17:59 +05:30
Madawa Soysa	0f291d5d04	Fixing generic policy saving issues ... This commit changes the generic policy mode to application/json and add generic policy add/edit/view units.	2016-12-15 11:29:14 +05:30
geethkokila	2b7d5fd66b	Fixing the null pointer issue in policy manager	2016-12-15 10:57:48 +05:30
Vishanth	1714328db0	datasource access for multi tenancy	2016-12-15 10:32:26 +05:30
Rasika Perera	9f615916d0	Fixing analyticsEnabled and groupingEnabled not working	2016-12-11 14:56:31 +05:30
Rasika Perera	1bee155d9a	Fixing formatting issue	2016-12-09 19:06:00 +05:30
Rasika Perera	91437ff81c	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-09 18:39:39 +05:30
Rasika Perera	c284732192	Displaying SSO auth failure messages	2016-12-09 18:22:09 +05:30
Rasika Perera	9fd6145605	Fixing SSO issue	2016-12-09 17:34:56 +05:30
WSO2 Builder	a59edee410	[maven-release-plugin] prepare for next development iteration	2016-12-08 14:39:00 +00:00
WSO2 Builder	8f9b21b41b	[maven-release-plugin] prepare release v2.0.3	2016-12-08 14:37:11 +00:00
charitha	d8881244fd	Fix issue in task operation	2016-12-08 20:03:54 +05:30
charitha	0a7f8ac22c	Update error pages and CsrfGuard property file.	2016-12-08 19:41:43 +05:30
charitha	78dfddbbed	Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x	2016-12-08 18:58:47 +05:30
madhawap	fa171ef079	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2016-12-08 17:38:24 +05:30
madhawap	d62a9c8b83	resolving conflicts	2016-12-08 17:38:12 +05:30