megala21
|
f3bca0f88c
|
Merging with master
|
8 years ago |
geethkokila
|
fe67d251d5
|
Fixing the #460 issue
|
8 years ago |
ayyoob
|
2dab109ad3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
geethkokila
|
1655b512b0
|
Fixing formating issues
|
8 years ago |
geethkokila
|
5f71313af1
|
Fixing formating issues
|
8 years ago |
geethkokila
|
07357124b0
|
Fixing the task for all the tenants
|
8 years ago |
ayyoob
|
80cc690a42
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
sinthuja
|
4018d582ed
|
Adding comments to the batch size config.
|
8 years ago |
sinthuja
|
f2ea96efde
|
Reverting the changes done to GenericFeatureDAOImpl.
|
8 years ago |
sinthuja
|
ce5ca09e51
|
Adding oracle server specific impl.
|
8 years ago |
sinthuja
|
124c0b4cf8
|
Fixing issues related to oracle database.
|
8 years ago |
ayyoob
|
3b7d4d8966
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
Harshan Liyanage
|
3857be50b9
|
Fixed wso2/product-iots#473
|
8 years ago |
ayyoob
|
07bdd5cb6c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
Harshan Liyanage
|
43ba1e1b43
|
Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005
|
8 years ago |
ayyoob
|
6c7f911cbc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
|
8 years ago |
Harshan Liyanage
|
3766ba0349
|
Refactored DeviceMgmtProviderService to fetch only the required data which resolves product-iots#991
|
8 years ago |
ayyoob
|
a7ebc96cb7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0
|
8 years ago |
Harshan Liyanage
|
35d1c9897e
|
Resolves harshanl/product-iots#518
|
8 years ago |
ayyoob
|
dd1c2e4338
|
Added few fixes after testing and added default UI for device type management
|
8 years ago |
ayyoob
|
abc9315f95
|
Added Pluggable Device Type
|
8 years ago |
Chatura Dilan
|
9d5e912d11
|
Added MySQL DAO
|
8 years ago |
warunalakshitha
|
97a53a7387
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Harshan Liyanage
|
273be79ca2
|
Resolving #695:Fix for Policy Delegation task is not starting for tenants in distributed setup
|
8 years ago |
warunalakshitha
|
5831d277da
|
Fixing https://github.com/wso2/carbon-device-mgt-plugins/issues/613
|
8 years ago |
ayyoob
|
20c3940ca4
|
made MonitoringTask to get config from device management service
|
8 years ago |
ayyoob
|
db2ddc7bed
|
policy manager refactored to support tenancy
|
8 years ago |
Ruwan
|
7619eabc87
|
Merge pull request #495 from rasika/release-2.0.x
IOTS-325: Fixing cannot delete a policy associated with a group
|
8 years ago |
Rasika Perera
|
4cd2b94303
|
IOTS-325: Fixing cannot delete a policy associated with a group
|
8 years ago |
Supun94
|
a831dc6a9a
|
Changing cdm-config file
|
8 years ago |
Supun94
|
89410dfae4
|
Changing getEffectiveFeatures method
|
8 years ago |
Supun94
|
2751d4b856
|
Code refactoring
|
8 years ago |
Supun94
|
eb1575126f
|
Minor refactoring on policy merging
|
8 years ago |
Supun94
|
451b2fd1dc
|
Minor refactoring on policy evaluation
|
8 years ago |
Supun94
|
02fb952cc0
|
Minor refactoring on policy decision point
|
8 years ago |
Supun94
|
35f3fcc8f9
|
Changed policy evaluation point
|
8 years ago |
Supun94
|
62acc2ebf2
|
Adding merged policy evaluation service component
|
8 years ago |
Supun94
|
936e71a743
|
Adding configurations for different policy evaluation service components
|
8 years ago |
Supun94
|
272ba7b012
|
Changed getEffectiveFeatures method
|
8 years ago |
Supun94
|
c91da9219d
|
fixed policy conflicts
|
8 years ago |
geethkokila
|
2b7d5fd66b
|
Fixing the null pointer issue in policy manager
|
8 years ago |
geethkokila
|
20ca76640d
|
Adding changes for the grouping and ownership changes
|
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 |
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 |
harshanl
|
370f6de260
|
Removed applied policy upon removal of the last policy applicable for a device
|
8 years ago |
harshanl
|
036ed6fe41
|
Added POLICY_REVOKE operation upon deletion of the last policy
|
8 years ago |
harshanl
|
73539362d4
|
Refactored PolicyAdministratorPointImpl
|
8 years ago |
harshanl
|
6e1fdabaad
|
EMM-1342:Added policy revoke operation
|
8 years ago |
harshanl
|
24c38602b8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
harshanl
|
51910ee67a
|
EMM-1675:Added policy revoke operation
|
8 years ago |