Commit Graph

4077 Commits

Author SHA1 Message Date
Ace
d6770c261a updating appm dependencies to relased version 2016-12-22 23:04:15 +05:30
Ayyoob Hamza
4960fd0d05 Merge pull request #499 from charithag/release-2.0.x-IOTS-342
Fixed https://wso2.org/jira/browse/IOTS-342
2016-12-22 19:56:45 +05:30
charitha
a625ccecf0 Fixed https://wso2.org/jira/browse/IOTS-342 2016-12-22 19:53:12 +05:30
Ruwan
46c3b015fa Merge pull request #498 from charithag/release-2.0.x-email-invites
Release 2.0.x email invites
2016-12-22 18:41:22 +05:30
charitha
58a9ea80c7 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-22 18:39:26 +05:30
Charitha Goonetilleke
5318601df0 Add license header 2016-12-22 18:37:31 +05:30
charitha
2b1d46f45f Finalized enrollment invitations 2016-12-22 18:30:07 +05:30
Charitha Goonetilleke
af8902f392 Merge pull request #497 from rasika/release-2.0.x
Removing device-view button
2016-12-22 16:14:08 +05:30
Rasika Perera
b0d32a140e Adding context for anchor links 2016-12-22 16:12:04 +05:30
Rasika Perera
ad92a5278e Adding on-image anchor links instead of separate btn for device-view 2016-12-22 15:59:10 +05:30
Rasika Perera
6f7d87a590 Merge pull request #496 from madhawap/release-2.0.x
Task operation config related changes
2016-12-22 14:01:09 +05:30
madhawap
d486ad14fd Task operation config related changes 2016-12-22 13:47:39 +05:30
Ace
64da9479a1 Bumping identity dependencies 2016-12-22 12:32:24 +05:30
Ruwan
7619eabc87 Merge pull request #495 from rasika/release-2.0.x
IOTS-325: Fixing cannot delete a policy associated with a group
2016-12-22 11:01:08 +05:30
Ace
1d2a5dc9ef Updating identity/auth-saml dependencies to latest 2016-12-22 10:58:59 +05:30
Rasika Perera
4cd2b94303 IOTS-325: Fixing cannot delete a policy associated with a group 2016-12-22 10:58:54 +05:30
Geeth
6eb8beaa2a Merge pull request #493 from Supun94/release-2.0.x
Support for Device Management Policy Merging
2016-12-22 10:33:21 +05:30
charitha
795ccb740c Add backend support for enrollment invitations 2016-12-20 23:46:55 +05:30
geethkokila
83b9fd46cd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-20 16:59:03 +05:30
Charitha Goonetilleke
99fa092a72 Merge pull request #494 from rasika/release-2.0.x
IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext
2016-12-20 13:33:20 +05:30
Rasika Perera
a633547d19 IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext 2016-12-20 13:03:19 +05:30
geethkokila
1b4857b7fd Fixing conflicts 2016-12-20 11:19:58 +05:30
geethkokila
51c46095a4 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-20 10:44:55 +05:30
Supun94
a831dc6a9a Changing cdm-config file 2016-12-19 16:19:36 +05:30
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
Rasika Perera
84918f58c7 Merge pull request #492 from charithag/release-2.0.x-qrupdate
Moved qr modal to device mgt core
2016-12-19 15:32:47 +05:30
charitha
7acbc5cd0b Moved qr modal to device mgt core 2016-12-19 15:25:06 +05:30
geethkokila
8ca28fa1fd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature 2016-12-19 13:47:27 +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