charitha
|
a9cb2ae84d
|
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
|
4 years ago |
Pahansith
|
bc85a89cf9
|
Change event task to implement ntask interface
|
4 years ago |
Ruwan Yatawara
|
d7c3002629
|
Merge branch 'master' into 'master'
Improve information logging
See merge request entgra/carbon-device-mgt!707
|
4 years ago |
tcdlpds@gmail.com
|
087b826d29
|
Improve information logging
|
4 years ago |
Dharmakeerthi Lasantha
|
47f0c84d8a
|
Merge branch 'master' into 'master'
Add missing scopes
See merge request entgra/carbon-device-mgt!706
|
4 years ago |
tcdlpds@gmail.com
|
0c31b7cd49
|
Add missing scopes
|
4 years ago |
Dharmakeerthi Lasantha
|
8bf3272333
|
Merge branch 'corrective-sync' into 'master'
Improve metadata API
See merge request entgra/carbon-device-mgt!705
|
4 years ago |
Shamalka Navod
|
eccb39d6f4
|
Improve metadata API
|
4 years ago |
Inosh Perara
|
5297dfa73d
|
Merge branch 'lasantha' into 'master'
Adding heart beat management functionality for dynamic task distribution
See merge request entgra/carbon-device-mgt!695
|
4 years ago |
Ace
|
76c9332541
|
Added disclaimer to heart-beat-config
|
4 years ago |
Ace
|
ceab2566ac
|
Addressing review comments
|
4 years ago |
Ace
|
5531bc0140
|
Addressing review comments
|
4 years ago |
Ace
|
4df57ede61
|
incoorporating review comments
|
4 years ago |
Dharmakeerthi Lasantha
|
d9386901d4
|
Merge branch 'corrective-policy' into 'master'
Implement OIDC Based SSO For All React Applications
Closes product-iots#656
See merge request entgra/carbon-device-mgt!680
|
4 years ago |
Vigneshan Seshamany
|
44c7affb49
|
Improve publisher ui to support sso
|
4 years ago |
Vigneshan Seshamany
|
6ee1d31a0e
|
Improve store ui to support sso
|
4 years ago |
Vigneshan Seshamany
|
0917d3bf7f
|
Improve consent management page to process oidc requests
|
4 years ago |
Vigneshan Seshamany
|
f31befb342
|
Implement oidc based sso among all web apps
|
4 years ago |
Ace
|
bac6e3ba67
|
merging with upstream
|
4 years ago |
Ace
|
cfe206b32c
|
correcting task random candidate election logic
|
4 years ago |
Ace
|
7734dbd654
|
Fixing issue with candidate election
|
4 years ago |
Ace
|
c6db9eeecc
|
adding randomly assigned task functionality and other improvements
|
4 years ago |
Dharmakeerthi Lasantha
|
b7b8bf6b96
|
Merge branch 'corrective-policy' into 'master'
Add Corrective Policy and Geo-Fence Features
Closes product-iots#656
See merge request entgra/carbon-device-mgt!660
|
4 years ago |
Dharmakeerthi Lasantha
|
b1abbf1508
|
Merge branch 'corrective-policy' into 'corrective-policy'
Add missing error logs to OperationManagerImpl
See merge request entgra/carbon-device-mgt!704
|
4 years ago |
Pahansith Gunathilake
|
caba7fc673
|
Add missing error logs to OperationManagerImpl
|
4 years ago |
Dharmakeerthi Lasantha
|
d4dde59fc5
|
Merge branch 'corrective-policy' into 'corrective-policy'
Fix code formatting issues in geo fence and corrective policy features
See merge request entgra/carbon-device-mgt!703
|
4 years ago |
Pahansith
|
0e4a02635d
|
Add method comments and format code
|
4 years ago |
Pahansith
|
6e208cde4d
|
Merge branch 'corrective-policy' of https://gitlab.com/entgra/carbon-device-mgt into corrective-policy
|
4 years ago |
Pahansith
|
e5dd609dc2
|
Add method comments and format code
|
4 years ago |
Dharmakeerthi Lasantha
|
ce13b0f131
|
Merge branch 'corrective-policy' into 'corrective-policy'
Sync with master branch
See merge request entgra/carbon-device-mgt!702
|
4 years ago |
tcdlpds@gmail.com
|
6b3173332f
|
Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into corrective-policy
|
4 years ago |
charitha
|
911bd62a44
|
Fix not adhering 'initiated by'
|
4 years ago |
charitha
|
31a6497950
|
Fix enrollment modification issues
|
4 years ago |
charitha
|
d75f48166e
|
Provide response based on headers
|
4 years ago |
charitha
|
10d114ba1e
|
Improve activity retrieval logic
|
4 years ago |
Ace
|
9d39197844
|
Adding improvements to dynamic task allocation
|
4 years ago |
Inosh Perara
|
30f78f5ba9
|
Merge branch 'geofence4-event-operation-1' into 'corrective-policy'
Introduce event operations & geo fence event handling
See merge request entgra/carbon-device-mgt!699
|
4 years ago |
Pahansith
|
a3629d5932
|
Add group data into geofence response, Format code
|
4 years ago |
Pahansith
|
8c80185610
|
Add doc comments and format code
|
4 years ago |
Pahansith
|
d9d0ba5d90
|
Add event delete API
|
4 years ago |
Pahansith
|
fed779302a
|
Fix issues in Event DAO and improvements for the operation task
|
4 years ago |
Pahansith
|
f073ee9276
|
Add H2 DAO for event configuration
|
4 years ago |
Pahansith
|
75b619d5f9
|
Add event configuration operation creation tasks
|
4 years ago |
Pahansith
|
a401c9d91d
|
Fix test failure
|
4 years ago |
Pahansith
|
efe116d87e
|
Modify geofence get API
|
4 years ago |
Pahansith
|
af85ca47e0
|
Change Geo fence edit API - Attach Events
|
4 years ago |
Pahansith
|
bd8cf5237d
|
Change Geo fence create API - Attach Event creation
|
4 years ago |
Pahansith
|
0f915a2961
|
Merge branch 'corrective-policy' of https://gitlab.com/entgra/carbon-device-mgt into corrective-policy
|
4 years ago |
Ace
|
b1d95af5b0
|
remvoing restriction that prevents activity count to be returned when if-modified-since header is present
|
4 years ago |
Ace
|
ada570f0a0
|
fixing NPE when processing operations
|
4 years ago |