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
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
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
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
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
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
kamidu
0867b3d075
updating the footer
2016-10-31 15:39:10 +05:30
Rasika Perera
fbe423b824
Using permissionsUtil.hasPermission for clientside permission check
2016-10-29 23:46:49 +05:30
Rasika Perera
b1b6b94570
Adding permissionsUtil
2016-10-29 23:13:52 +05:30
sameera910409
f8f7dd08cd
fixed share groups and group analytics in device grouping
2016-10-28 14:07:50 +05:30
Harshan Liyanage
261e8c510c
Fixed syntax issue in device.js file
2016-10-27 15:32:38 +05:30
Charitha Goonetilleke
353707c9c7
Merge pull request #404 from sameeragunarathne/IoTS-1.0.0
...
add group listing and group device listing fixes
2016-10-26 17:55:03 +05:30
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
kamidu
12e609c737
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-26 17:40:05 +05:30
kamidu
0c70c87406
fix for EMM-1673
2016-10-26 17:39:47 +05:30
Kamidu Sachith Punchihewa
02d3adf51e
Merge pull request #401 from madawas/modal-refactor
...
Refactoring pages to use new modal unit
2016-10-26 17:29:50 +05:30
Kamidu Sachith Punchihewa
33874f95b6
Merge pull request #399 from saadsahibjan/master
...
Fix incorrect spacing
2016-10-26 17:28:59 +05:30
Kamidu Sachith Punchihewa
9d90411189
Merge pull request #402 from madawas/EMM-1298
...
Fix for EMM-1298
2016-10-26 17:27:33 +05:30
Kamidu Sachith Punchihewa
a295c88dc0
Merge pull request #405 from Megala21/master
...
Refactoring code
2016-10-26 17:27:04 +05:30
sameera910409
204a0ed943
fixes for the comments of the PR#404
2016-10-26 15:14:53 +05:30
Megala
a088392b2f
Adding css for required fields
2016-10-26 11:58:23 +05:30
sameera910409
fef7c07cb2
add device group deleting and updating fixes
2016-10-26 10:08:48 +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
sameera910409
41f367abfa
add group listing and group device listing fixes
2016-10-25 17:48:16 +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
Ruwan
072119d7df
Merge pull request #403 from ayyoob/commit-fixes
...
Commit fixes
2016-10-25 15:29:04 +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
ayyoob
3140c36f7b
added missing license headers
2016-10-25 13:57:16 +05:30
Harshan Liyanage
1ba2e2f768
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-25 11:51:16 +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
Madawa Soysa
774eaadb71
EMM-1298: Extracting serial number from the certificate itself when adding a certificate
2016-10-25 11:43:58 +05:30
kamidu
65ed6c2f6e
include owner for the operations api
2016-10-25 11:31:00 +05:30
sinthuja
a6203845c9
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
2016-10-24 16:37:00 +05:30
sinthuja
00e57bd800
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
2016-10-24 16:31:41 +05:30
ayyoob
8293ed43ae
added missing imports
2016-10-24 02:17:20 +05:30
ayyoob
16f6a62dca
refactored DAO handler
2016-10-23 17:37:27 +05:30
ayyoob
fbfb86c53e
refactored DAO handler
2016-10-23 15:45:29 +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
