Commit Graph

3208 Commits

Author SHA1 Message Date
Imesh Chandrasiri
a56b953fcb Validation error fix 2016-11-29 13:32:29 +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 Goonetilleke
a040be18d8 Merge pull request #437 from wso2/IoTS-1.0.0
Freezing code for the release
2016-11-25 13:03:53 +05:30
Charitha Goonetilleke
9dc9d00e96 Merge pull request #438 from rasika/IoTS-1.0.0
Minor ui changes to the group listing
2016-11-25 12:41:32 +05:30
Rasika Perera
4789aafd28 Minor ui changes to the group listing 2016-11-25 12:28:48 +05:30
Charitha Goonetilleke
027498895a Merge pull request #436 from DimalChandrasiri/IoTS-1.0.0
Merging UI fixes
2016-11-25 11:48:23 +05:30
Charitha Goonetilleke
c0d1beda36 Merge pull request #435 from rasika/IoTS-1.0.0
Decrease group listing page loading time with lazy roles listing
2016-11-25 11:26:36 +05:30
Imesh Chandrasiri
54bb91d428 IoT Build UI Fixes 2016-11-25 11:19:14 +05:30
Rasika Perera
03f965adf6 Decrease group listing page loading time with lazy roles listing 2016-11-25 11:18:17 +05:30
Imesh Chandrasiri
07a0dee2d9 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-25 11:18:15 +05:30
Charitha Goonetilleke
51209be334 Merge pull request #434 from wso2/IoTS-1.0.0
Add commits in IoTS-1.0.0 for release
2016-11-25 11:05:51 +05:30
Charitha Goonetilleke
42f7233065 Merge pull request #433 from rasika/IoTS-1.0.0
Update device grouping UIs to work with new sharing model
2016-11-25 11:03:38 +05:30
Charitha Goonetilleke
36ef29dfa5 Merge pull request #432 from charithag/IoTS-1.0.0
Device Grouping with user role based sharing implementation
2016-11-25 11:03:21 +05:30
Rasika Perera
05453e7379 Removed 'role' suffix from roles listing page 2016-11-25 10:35:45 +05:30
Rasika Perera
ce4b389df0 Merge branch 'IoTS-1.0.0' of https://github.com/charithag/carbon-device-mgt into IoTS-1.0.0 2016-11-25 08:23:20 +05:30
Rasika Perera
aaade2363c Adding new api to create combined roles 2016-11-25 08:18:10 +05:30
Rasika Perera
3fe18ba4bb Refactoring group sharing modal 2016-11-25 08:17:39 +05:30
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
Imesh Chandrasiri
5525c42eae Removed Unneccsary title and added padding 2016-11-23 16:43:16 +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
Ruwan
f3b3389a8a Merge pull request #426 from ayyoob/IoTS-1.0.0
exposed device access authorisation as a service
2016-11-22 15:59:22 +05:30
ayyoob
ec3dbd37dd fixed commit comments 2016-11-22 15:03:23 +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
e3849ef21e removed feature lifecycle implementation 2016-11-21 20:49: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
Dilan U. Ariyaratne
023b554e0f Merge pull request #425 from GPrathap/IoTS-1.0.0
removed @API and @Permission annotations
2016-11-20 19:35:42 +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
Ruwan
906d870309 Merge pull request #423 from ayyoob/IoTS-1.0.0
few changes in feature manager implementation for deployer
2016-11-18 16:52:14 +05:30
ayyoob
20e7dd9e86 picked icon from features config 2016-11-17 23:33:04 +05:30
ayyoob
8a6af051dc Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-17 18:37:38 +05:30
ayyoob
a0c8aeb159 few changes after testing feature manager implementation 2016-11-17 18:35:40 +05:30
sinthuja
593d9cf985 Making autoVersionSubmodules enabled to avaoid the versions to be given seperately for sub modules. 2016-11-17 10:42:56 +05:30
Charitha Goonetilleke
d36de3de98 Merge pull request #421 from wso2/release-2.0.0
Release 2.0.1
2016-11-16 19:47:21 +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
d5f82820c5 Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0 2016-11-16 16:32:43 +05:30
Ace
16d2a062da Adding android device-view changes 2016-11-16 15:44:28 +05:30
Ace
a0616cf9a2 Adding config changes 2016-11-16 15:08:43 +05:30