Commit Graph

2745 Commits

Author SHA1 Message Date
Milan Perera
2a4a636eb4 Resolved conflicts and merged 2017-01-05 12:41:08 +05:30
Milan Perera
d13dadff08 Renamed prefix of scopes 2017-01-05 12:35:02 +05:30
GPrathap
0bd7b90e9a added scope annotation 2017-01-05 12:26:07 +05:30
Milan Perera
7b8a7c0b52 Merge pull request #1 from GPrathap/release-2.0.x
removed setting APIs secured as default.
2017-01-05 11:58:52 +05:30
Milan Perera
b860be0150 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-04 10:34:57 +05:30
charitha
295921b289 Fixed following issues:
https://wso2.org/jira/browse/IOTS-218
https://wso2.org/jira/browse/IOTS-236
https://wso2.org/jira/browse/IOTS-263
https://wso2.org/jira/browse/IOTS-173
2017-01-03 11:35:08 +05:30
Milan Perera
02d75b757c Fixed conflicts and merged 2017-01-03 10:37:46 +05:30
GPrathap
f508bcfd0e corrected method name 2017-01-01 22:03:50 +05:30
GPrathap
4c9578ebe2 resized buffer size to 0 for each scope 2017-01-01 21:53:53 +05:30
GPrathap
649879f998 removed setting APIs secured as default.
Because if secured is enabled, it is to be needed to provided parameters which are related to basic oauth, when this is false, jwt token is being used.
2017-01-01 21:13:53 +05:30
WSO2 Builder
6aea6195e9 [maven-release-plugin] prepare for next development iteration 2016-12-23 19:20:14 +00:00
WSO2 Builder
3db5b289ac [maven-release-plugin] prepare release v2.0.5 2016-12-23 19:18:26 +00:00
Rasika Perera
acb2c38799 Fixing user is not authorized to view devices 2016-12-24 00:42:04 +05:30
WSO2 Builder
ed47094964 [maven-release-plugin] prepare for next development iteration 2016-12-23 07:05:25 +00:00
WSO2 Builder
8d409a7248 [maven-release-plugin] prepare release v2.0.4 2016-12-23 07:00:40 +00:00
charitha
1a93868424 Fixed https://wso2.org/jira/browse/IOTS-335 2016-12-23 12:19:57 +05:30
charitha
61d1710614 Fixed https://wso2.org/jira/browse/IOTS-341 2016-12-23 11:12:42 +05:30
Ace
674048ab27 Coorecting version import ranges 2016-12-23 09:57:47 +05:30
Rasika Perera
d001cf2ee1 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-23 08:22:43 +05:30
Rasika Perera
fea128d29e Fixing grid-view cropped on group view 2016-12-23 08:22:12 +05:30
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
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
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