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 |
|
Harshan Liyanage
|
72522ad759
|
Fixed SQL syntax issue
|
2016-10-26 09:49:59 +05:30 |
|
Harshan Liyanage
|
9bf5ca94fb
|
Fixed SQL syntax issue
|
2016-10-25 18:50:38 +05:30 |
|
kamidu
|
1c2d339fed
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-25 17:22:26 +05:30 |
|
kamidu
|
7212e969d8
|
Fix for SQL query issue in mysql
|
2016-10-25 17:22:18 +05:30 |
|
charitha
|
5f68953b11
|
Merge branch 'master' into IoTS-1.0.0
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
|
2016-10-25 14:22:44 +05:30 |
|
Harshan Liyanage
|
f961b57f9f
|
EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
|
2016-10-25 11:50:38 +05:30 |
|
ayyoob
|
d17241e51e
|
added comments and license
|
2016-10-23 14:18:15 +05:30 |
|
ayyoob
|
45c0d2d2f5
|
added logs if device type registration failed
|
2016-10-23 10:51:14 +05:30 |
|
WSO2 Builder
|
27a2c9b979
|
[maven-release-plugin] prepare for next development iteration
|
2016-10-18 12:17:27 +00:00 |
|
WSO2 Builder
|
eae935f91c
|
[maven-release-plugin] prepare release v1.2.5
|
2016-10-18 12:09:16 +00:00 |
|
WSO2 Builder
|
6a55e1be83
|
[maven-release-plugin] prepare for next development iteration
|
2016-10-17 14:15:22 +00:00 |
|
WSO2 Builder
|
11c2e59f61
|
[maven-release-plugin] prepare release v1.2.4
|
2016-10-17 14:13:25 +00:00 |
|
harshanl
|
6e1fdabaad
|
EMM-1342:Added policy revoke operation
|
2016-10-14 17:13:43 +05:30 |
|
harshanl
|
a89b50197f
|
EMM-1757:Fixed admin device-detail view issue
|
2016-10-14 13:21:51 +05:30 |
|
harshanl
|
24c38602b8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-13 17:11:42 +05:30 |
|
harshanl
|
51910ee67a
|
EMM-1675:Added policy revoke operation
|
2016-10-13 17:11:36 +05:30 |
|
hasuniea
|
2128f08658
|
fixing EMM-1750
|
2016-10-13 10:00:08 +05:30 |
|
charitha
|
a2c0526b40
|
Fix typo
|
2016-10-10 15:34:18 +05:30 |
|