Supun94
|
35f3fcc8f9
|
Changed policy evaluation 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 |
|
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 |
|
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 |
|
WSO2 Builder
|
78b9052c37
|
[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4
|
2016-12-16 17:03:06 +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
|
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
|
d62a9c8b83
|
resolving conflicts
|
2016-12-08 17:38:12 +05:30 |
|
madhawap
|
b889f6e384
|
adding separate tasks for each device type
|
2016-12-08 17:21:07 +05:30 |
|
Hasunie
|
9a1c12d730
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
2016-12-08 15:59:30 +05:30 |
|
Hasunie
|
60d1281949
|
fixing windows device name issue
|
2016-12-08 15:58:32 +05:30 |
|
geethkokila
|
a0615d3d63
|
Merge branch 'release-2.0.x' into merge-master
|
2016-12-08 12:36:53 +05:30 |
|
geethkokila
|
d911281ad1
|
Merging master branch with release-2.0.x
|
2016-12-08 12:34:50 +05:30 |
|
Rasika Perera
|
641cc58bbf
|
Fixing enrollment broken issue
|
2016-12-07 14:37:10 +05:30 |
|
Rasika Perera
|
289987db8e
|
Throwing exception on getDevice when device is not found
|
2016-12-07 12:05:48 +05:30 |
|
Hasunie
|
b9e0b099a1
|
fixing device update issue
|
2016-12-07 08:37:00 +05:30 |
|
WSO2 Builder
|
228b24ca79
|
[maven-release-plugin] prepare for next development iteration
|
2016-12-01 12:14:01 +00:00 |
|
WSO2 Builder
|
5dbb258f55
|
[maven-release-plugin] prepare release v2.0.2
|
2016-12-01 12:10:10 +00:00 |
|
Chatura Dilan
|
82d865b104
|
Merge pull request #453 from madhawap/release-2.0.x
Seperate out task operations
|
2016-12-01 16:39:29 +05:30 |
|
madhawap
|
bec4ae681d
|
Seperate out task operations
|
2016-12-01 15:28:22 +05:30 |
|
charitha
|
564cece94b
|
Bug fixes
|
2016-11-30 17:11:01 +05:30 |
|
WSO2 Builder
|
8431b30ddc
|
[maven-release-plugin] prepare for next development iteration
|
2016-11-25 08:06:30 +00:00 |
|
WSO2 Builder
|
ae2e283f14
|
[maven-release-plugin] prepare release v2.0.1
|
2016-11-25 07:43:34 +00:00 |
|
charitha
|
ca5d96df67
|
Add test cases to verify DAO functionality
|
2016-11-24 13:29:25 +05:30 |
|
Rasika Perera
|
54211bc3cc
|
Fixing minor issues on GroupDAO
|
2016-11-24 09:58:42 +05:30 |
|
charitha
|
a2db592d69
|
Updated group management APIs and service
|
2016-11-23 14:06:24 +05:30 |
|
charitha
|
726bbcd35d
|
Merged with upstream
|
2016-11-23 13:51:50 +05:30 |
|
Madawa Soysa
|
55bc5042bb
|
Merge pull request #422 from madawas/grouping-policy
Generalize Policy Implementation - Creating system groups based on ownership
|
2016-11-23 10:00:17 +05:30 |
|
charitha
|
c07d77b85d
|
Updated group sharing model
|
2016-11-22 21:13:18 +05:30 |
|
Madawa Soysa
|
2f431504fe
|
creating groups from ownership and changing group owner
This commit includes following changes,
Creating groups using the device ownership
Changing the default system group owner to wso2.system.user
|
2016-11-22 13:25:27 +05:30 |
|
ayyoob
|
3fb42ef32e
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
|
2016-11-21 19:16:32 +05:30 |
|
ayyoob
|
fede8ec409
|
few changes after testing with authoriser
|
2016-11-21 19:13:59 +05:30 |
|
Madawa Soysa
|
8ab73ce07d
|
fixing issue with javadocs
|
2016-11-21 16:16:33 +05:30 |
|
Madawa Soysa
|
2164a30f88
|
changing group owner to super user
Changing the owner of the default system generated groups from the group creator to the super user of the system.
|
2016-11-21 16:16:00 +05:30 |
|
Madawa Soysa
|
c29bf24a75
|
Adding mobile devices to default groupes based on device ownership
Adding mobile devices to default system generated groups based on the device ownership (BYOD, COPE)
|
2016-11-21 09:21:44 +05:30 |
|
GPrathap
|
6efc5bc1ed
|
removed @API and @Permission annotations
|
2016-11-20 19:10:45 +05:30 |
|
ayyoob
|
fe263efe60
|
changed device access verification approach
|
2016-11-20 02:37:37 +05:30 |
|
ayyoob
|
28faf53802
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
|
2016-11-19 11:07:00 +05:30 |
|
ayyoob
|
59e2a33e4a
|
exposed device access authorisation as a service
|
2016-11-19 11:02:48 +05:30 |
|
WSO2 Builder
|
19c1b3566d
|
[maven-release-plugin] prepare for next development iteration
|
2016-11-16 12:18:48 +00:00 |
|
WSO2 Builder
|
cff6e242c8
|
[maven-release-plugin] prepare release v2.0.0
|
2016-11-16 12:16:25 +00:00 |
|
charitha
|
a6064d2561
|
Update component versions for IoTS-1.0.0 release
|
2016-11-16 13:32:13 +05:30 |
|
ayyoob
|
44ac6b13b5
|
changes in UI after refactoring
|
2016-11-07 00:51:08 +05:30 |
|
ayyoob
|
33bb9b5a14
|
merged with IoTS-1.0.0 branch
|
2016-11-02 06:51:28 +05:30 |
|
charitha
|
ac30e7eb3e
|
Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
|
2016-11-01 14:47:21 +05:30 |
|
WSO2 Builder
|
9517a3d30f
|
[maven-release-plugin] prepare for next development iteration
|
2016-10-31 10:34:22 +00:00 |
|
WSO2 Builder
|
a8568299b9
|
[maven-release-plugin] prepare release v1.2.6
|
2016-10-31 10:32:11 +00:00 |
|
charitha
|
1bfba25c5e
|
Remove user list and role list attributes from group object
Move group components to same devicemgt package levels
|
2016-10-26 17:51:38 +05:30 |
|