Commit Graph

2550 Commits

Author SHA1 Message Date
Rasika Perera
03f965adf6 Decrease group listing page loading time with lazy roles listing 2016-11-25 11:18:17 +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
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
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
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
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
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
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
charitha
a6064d2561 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:13 +05:30
charitha
40c59c2f16 Fix issues in policy UI 2016-11-16 12:46:10 +05:30
charitha
589ba9c40b Add missing units 2016-11-15 15:59:40 +05:30
charitha
b8d8b35847 Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0 2016-11-15 13:54:59 +05:30
sameera910409
02eec1033e add group sharing role create functionality 2016-11-15 12:20:58 +05:30
sinthuja
2f59f1566c Changing the port to the default port of the analytics pack. 2016-11-09 16:12:58 +05:30
ayyoob
415fae8007 fixed update issue 2016-11-08 23:40:28 +05:30
ayyoob
0f66c90660 preload db queries 2016-11-07 01:14:22 +05:30
ayyoob
44ac6b13b5 changes in UI after refactoring 2016-11-07 00:51:08 +05:30
ayyoob
4292442aa5 refactored device type deployer 2016-11-06 17:46:02 +05:30
Ace
5eaca0b1b1 merging with upstream 2016-11-04 20:09:01 +05:30
Ace
2aa1c98d0b bringing common features to cdmf 2016-11-04 19:12:06 +05:30
charitha
bb60acd105 Fix device listing issue 2016-11-02 12:59:43 +05:30
ayyoob
202e0d5619 merged with origin 2016-11-02 09:44:49 +05:30
ayyoob
33bb9b5a14 merged with IoTS-1.0.0 branch 2016-11-02 06:51:28 +05:30
sinthuja
a5212213cf Changing the default wbsocket URL to DAS endpoint. 2016-11-01 19:55:22 +05:30
charitha
d1a6353195 Synced with changes in master 2016-11-01 15:41:51 +05:30
charitha
4a115e5d3f Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-01 15:01:53 +05:30
Charitha Goonetilleke
e1a1f710a0 Merge pull request #406 from sameeragunarathne/IoTS-1.0.0
fixed share groups and group analytics in device grouping
2016-11-01 15:01:38 +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