Chatura Dilan
82d865b104
Merge pull request #453 from madhawap/release-2.0.x
...
Seperate out task operations
8 years ago
madhawap
2b00645779
refactored code
8 years ago
charitha
e718ab5504
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha
cad686b43c
Bug fixes & UI/UX improvements
8 years ago
madhawap
bec4ae681d
Seperate out task operations
8 years ago
Madawa Soysa
b2650e439c
Fix issue with policy wrapper group select
8 years ago
Madawa Soysa
345fdc0ced
IOTS-296: Removing ownership selection when policy creation
...
Removes ownership selection when creating and editing policies. Ownership management is done by the groups.
8 years ago
charitha
d9b670ef19
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
charitha
564cece94b
Bug fixes
8 years ago
Charitha Goonetilleke
e1d2d8a73f
Merge pull request #447 from ruwany/release-2.0.x
...
Adding android operations bar related changes
8 years ago
Ace
6126776fcf
Adding android operations bar related changes
8 years ago
Madawa Soysa
8cdc8cfb24
IOTS-296: Refactoring Policy create/edit units
8 years ago
Charitha Goonetilleke
d9763ff5b7
Merge pull request #445 from GPrathap/release-2.0.x
...
added creating an application for WebSocket
8 years ago
GPrathap
64ce41f571
added creating an application for WebSocket
8 years ago
Charitha Goonetilleke
bf48f57f84
Merge pull request #442 from DimalChandrasiri/release-2.0.x
...
Validation error fix
8 years ago
Charitha Goonetilleke
c84d7fd13d
Merge pull request #440 from DimalChandrasiri/IoTS-1.0.0
...
Data table fix when list view
8 years ago
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.
8 years ago
Imesh Chandrasiri
a56b953fcb
Validation error fix
8 years ago
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.
8 years ago
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.
8 years ago
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.
8 years ago
Imesh Chandrasiri
d90c9ab68a
Data table fix when list view
8 years ago
WSO2 Builder
8431b30ddc
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
ae2e283f14
[maven-release-plugin] prepare release v2.0.1
8 years ago
Rasika Perera
4789aafd28
Minor ui changes to the group listing
8 years ago
Charitha Goonetilleke
027498895a
Merge pull request #436 from DimalChandrasiri/IoTS-1.0.0
...
Merging UI fixes
8 years ago
Imesh Chandrasiri
54bb91d428
IoT Build UI Fixes
8 years ago
Rasika Perera
03f965adf6
Decrease group listing page loading time with lazy roles listing
8 years ago
Imesh Chandrasiri
07a0dee2d9
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
Rasika Perera
05453e7379
Removed 'role' suffix from roles listing page
8 years ago
Rasika Perera
ce4b389df0
Merge branch 'IoTS-1.0.0' of https://github.com/charithag/carbon-device-mgt into IoTS-1.0.0
8 years ago
Rasika Perera
aaade2363c
Adding new api to create combined roles
8 years ago
Rasika Perera
3fe18ba4bb
Refactoring group sharing modal
8 years ago
charitha
ca5d96df67
Add test cases to verify DAO functionality
8 years ago
Rasika Perera
54211bc3cc
Fixing minor issues on GroupDAO
8 years ago
Imesh Chandrasiri
5525c42eae
Removed Unneccsary title and added padding
8 years ago
charitha
a2db592d69
Updated group management APIs and service
8 years ago
charitha
726bbcd35d
Merged with upstream
8 years ago
Madawa Soysa
55bc5042bb
Merge pull request #422 from madawas/grouping-policy
...
Generalize Policy Implementation - Creating system groups based on ownership
8 years ago
charitha
c07d77b85d
Updated group sharing model
8 years ago
ayyoob
ec3dbd37dd
fixed commit comments
8 years ago
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
8 years ago
ayyoob
e3849ef21e
removed feature lifecycle implementation
8 years ago
ayyoob
3fb42ef32e
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob
fede8ec409
few changes after testing with authoriser
8 years ago
Madawa Soysa
8ab73ce07d
fixing issue with javadocs
8 years ago
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.
8 years ago
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)
8 years ago
GPrathap
6efc5bc1ed
removed @API and @Permission annotations
8 years ago
ayyoob
fe263efe60
changed device access verification approach
8 years ago
ayyoob
28faf53802
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob
59e2a33e4a
exposed device access authorisation as a service
8 years ago
ayyoob
20e7dd9e86
picked icon from features config
8 years ago
ayyoob
8a6af051dc
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ayyoob
a0c8aeb159
few changes after testing feature manager implementation
8 years ago
WSO2 Builder
19c1b3566d
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
cff6e242c8
[maven-release-plugin] prepare release v2.0.0
8 years ago
Ace
16d2a062da
Adding android device-view changes
8 years ago
Ace
a0616cf9a2
Adding config changes
8 years ago
charitha
a6064d2561
Update component versions for IoTS-1.0.0 release
8 years ago
charitha
40c59c2f16
Fix issues in policy UI
8 years ago
charitha
589ba9c40b
Add missing units
8 years ago
charitha
b8d8b35847
Merge branch 'IoTS-1.0.0' of https://github.com/sameeragunarathne/carbon-device-mgt into IoTS-1.0.0
8 years ago
sameera910409
02eec1033e
add group sharing role create functionality
8 years ago
sinthuja
2f59f1566c
Changing the port to the default port of the analytics pack.
8 years ago
ayyoob
44ac6b13b5
changes in UI after refactoring
8 years ago
Ace
5eaca0b1b1
merging with upstream
8 years ago
Ace
2aa1c98d0b
bringing common features to cdmf
8 years ago
charitha
bb60acd105
Fix device listing issue
8 years ago
ayyoob
33bb9b5a14
merged with IoTS-1.0.0 branch
8 years ago
sinthuja
a5212213cf
Changing the default wbsocket URL to DAS endpoint.
8 years ago
charitha
d1a6353195
Synced with changes in master
8 years ago
charitha
4a115e5d3f
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
Charitha Goonetilleke
e1a1f710a0
Merge pull request #406 from sameeragunarathne/IoTS-1.0.0
...
fixed share groups and group analytics in device grouping
8 years ago
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
8 years ago
WSO2 Builder
9517a3d30f
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
a8568299b9
[maven-release-plugin] prepare release v1.2.6
8 years ago
kamidu
0867b3d075
updating the footer
8 years ago
Rasika Perera
fbe423b824
Using permissionsUtil.hasPermission for clientside permission check
8 years ago
Rasika Perera
b1b6b94570
Adding permissionsUtil
8 years ago
sameera910409
f8f7dd08cd
fixed share groups and group analytics in device grouping
8 years ago
Harshan Liyanage
261e8c510c
Fixed syntax issue in device.js file
8 years ago
Charitha Goonetilleke
353707c9c7
Merge pull request #404 from sameeragunarathne/IoTS-1.0.0
...
add group listing and group device listing fixes
8 years ago
charitha
1bfba25c5e
Remove user list and role list attributes from group object
...
Move group components to same devicemgt package levels
8 years ago
kamidu
12e609c737
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
0c70c87406
fix for EMM-1673
8 years ago
Kamidu Sachith Punchihewa
02d3adf51e
Merge pull request #401 from madawas/modal-refactor
...
Refactoring pages to use new modal unit
8 years ago
Kamidu Sachith Punchihewa
33874f95b6
Merge pull request #399 from saadsahibjan/master
...
Fix incorrect spacing
8 years ago
Kamidu Sachith Punchihewa
9d90411189
Merge pull request #402 from madawas/EMM-1298
...
Fix for EMM-1298
8 years ago
Kamidu Sachith Punchihewa
a295c88dc0
Merge pull request #405 from Megala21/master
...
Refactoring code
8 years ago
sameera910409
204a0ed943
fixes for the comments of the PR#404
8 years ago
Megala
a088392b2f
Adding css for required fields
8 years ago
sameera910409
fef7c07cb2
add device group deleting and updating fixes
8 years ago
Harshan Liyanage
72522ad759
Fixed SQL syntax issue
8 years ago
Harshan Liyanage
9bf5ca94fb
Fixed SQL syntax issue
8 years ago
sameera910409
41f367abfa
add group listing and group device listing fixes
8 years ago
kamidu
1c2d339fed
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
7212e969d8
Fix for SQL query issue in mysql
8 years ago
Ruwan
072119d7df
Merge pull request #403 from ayyoob/commit-fixes
...
Commit fixes
8 years ago
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
8 years ago