charitha
3cb13e18a5
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-11-30 14:03:59 +05:30
Charitha Goonetilleke
d9763ff5b7
Merge pull request #445 from GPrathap/release-2.0.x
...
added creating an application for WebSocket
2016-11-30 13:05:36 +05:30
GPrathap
64ce41f571
added creating an application for WebSocket
2016-11-30 12:44:26 +05:30
GPrathap
c969013ca2
added new property : validity Period
2016-11-30 12:33:36 +05:30
charitha
a8e4a5f6fc
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-11-30 11:46:18 +05:30
Charitha Goonetilleke
5bc17e67b0
Merge pull request #444 from rasika/IoTS-1.0.0
...
Fixing osgi exports and swagger.io.annotations issue
2016-11-30 11:41:53 +05:30
Charitha Goonetilleke
bf48f57f84
Merge pull request #442 from DimalChandrasiri/release-2.0.x
...
Validation error fix
2016-11-30 11:41:01 +05:30
Charitha Goonetilleke
c84d7fd13d
Merge pull request #440 from DimalChandrasiri/IoTS-1.0.0
...
Data table fix when list view
2016-11-30 11:40:27 +05:30
charitha
4c60c90537
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-11-30 11:30:07 +05:30
Rasika Perera
e9e4c1a3d2
Fixing osgi exports and swagger.io.annotations issue
2016-11-30 11:26:15 +05:30
Madawa Soysa
20dee2ec44
Merge pull request #441 from madawas/IOTS-296
...
Generalizing Policy UI
2016-11-29 18:36:31 +05:30
Madawa Soysa
c61cd484a0
IOTS-296: Adding group selection capability when adding a policy
...
This commit introduces the device group select capabilty and saving the policy when creating and editing policies.
2016-11-29 18:34:25 +05:30
Imesh Chandrasiri
a56b953fcb
Validation error fix
2016-11-29 13:32:29 +05:30
Madawa Soysa
a4ca74c6c0
IOTS-296: Generalizing policy UI for policy edit
...
This commit removes device type specific client side logic and UI components from the `cdmf.unit.policy.edit` unit.
2016-11-28 16:36:12 +05:30
Madawa Soysa
7aada58472
IOTS-296: Fixing issue with device type icon
...
This commit fixes an issue which is unable to load device type icons in the policy listing page.
2016-11-28 16:36:12 +05:30
Madawa Soysa
0dfde40b7c
IOTS-296: Generalizing policy UI for policy create wizard
...
This commit is done to seperate policy related client side logic and UIs from device type specific logics.
This is a part of creating self contained plugins for device types.
This commit generalizes the policy creation wizard in the CDMF core and removes device type specific UIs and client side logic from the core. Also, this introduces a generic policy configuration UI in a new unit.
2016-11-28 16:36:12 +05:30
Imesh Chandrasiri
d90c9ab68a
Data table fix when list view
2016-11-28 11:33:16 +05:30
charitha
431ce58c65
Merge with release-2.0.x branch
2016-11-25 14:24:20 +05:30
charitha
1bcea7cc1b
Move components with org.wso2.mdm group id to org.wso2.carbon.devicemgt group
2016-11-25 14:22:00 +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