Commit Graph

9169 Commits

Author SHA1 Message Date
Dharmakeerthi Lasantha
bedb75847c Merge branch 'master' into 'master'
Fix SLO issue

See merge request entgra/carbon-device-mgt!713
2021-01-05 05:02:08 +00:00
vigneshan
256d6c334f Fix SLO issue 2021-01-04 12:13:54 +05:30
Charitha Goonetilleke
84f3787fc5 Merge branch 'master' into 'master'
Fix issue in not updating operation response for non-removed devices

See merge request entgra/carbon-device-mgt!712
2020-12-21 08:14:54 +00:00
charitha
9a2792dd31 Fix issue in not updating operation response for non-removed devices 2020-12-21 13:25:32 +05:30
Dharmakeerthi Lasantha
60bc2b7196 Merge branch 'upstream-master' into 'master'
Change event task to implement ntask interface

See merge request entgra/carbon-device-mgt!708
2020-12-18 15:24:16 +00:00
Pahansith
baeb34e1da Fix review issues and format code 2020-12-18 20:37:04 +05:30
Pahansith
a36733d224 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master 2020-12-16 23:00:04 +05:30
Dharmakeerthi Lasantha
27a6c45f57 Merge branch 'config-param-modify' into 'master'
Add windows agent token generation parameters to config API

See merge request entgra/carbon-device-mgt!711
2020-12-16 17:06:48 +00:00
Pahansith
931fb8ef54 Add windows agent token generation parameters to config API 2020-12-16 21:16:38 +05:30
Pahansith
b4f88f0cfd Add missing h2 table 2020-12-16 18:51:25 +05:30
Dharmakeerthi Lasantha
8864b1355c Merge branch 'master' into 'master'
Add jwt bearer grant type for sso service providers

See merge request entgra/carbon-device-mgt!710
2020-12-16 07:27:39 +00:00
Vigneshan
929a94dc73 Add jwt bearer grant type for sso service providers 2020-12-16 11:55:37 +05:30
Pahansith
987f8edd61 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master 2020-12-16 00:02:37 +05:30
Dharmakeerthi Lasantha
e23c2ea29c Merge branch 'master' into 'master'
Remove APPM store and publisher UIs from device-mgt core

See merge request entgra/carbon-device-mgt!709
2020-12-13 12:54:35 +00:00
tcdlpds@gmail.com
52761c673d Remove APPM store and publisher UIs from device-mgt core 2020-12-12 09:20:31 +05:30
charitha
4943635a61 Fetch enrollment Id if it is not already in the device 2020-12-12 03:01:56 +05:30
charitha
55c3f93deb Update license to entgra 2020-12-11 20:47:45 +05:30
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
2020-12-11 17:26:53 +05:30
Pahansith
bc85a89cf9 Change event task to implement ntask interface 2020-12-11 04:16:23 +05:30
Ruwan Yatawara
d7c3002629 Merge branch 'master' into 'master'
Improve information logging

See merge request entgra/carbon-device-mgt!707
2020-12-09 11:38:30 +00:00
tcdlpds@gmail.com
087b826d29 Improve information logging 2020-12-09 16:57:15 +05:30
Dharmakeerthi Lasantha
47f0c84d8a Merge branch 'master' into 'master'
Add missing scopes

See merge request entgra/carbon-device-mgt!706
2020-12-08 17:22:15 +00:00
tcdlpds@gmail.com
0c31b7cd49 Add missing scopes 2020-12-08 22:49:35 +05:30
Dharmakeerthi Lasantha
8bf3272333 Merge branch 'corrective-sync' into 'master'
Improve metadata API

See merge request entgra/carbon-device-mgt!705
2020-12-07 20:15:18 +00:00
Shamalka Navod
eccb39d6f4 Improve metadata API 2020-12-07 20:15:18 +00:00
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
2020-12-07 09:24:20 +00:00
Ace
76c9332541 Added disclaimer to heart-beat-config 2020-12-07 14:00:26 +05:30
Ace
ceab2566ac Addressing review comments 2020-12-07 13:27:57 +05:30
Ace
5531bc0140 Addressing review comments 2020-12-07 13:19:46 +05:30
Ace
4df57ede61 incoorporating review comments 2020-12-07 13:09:14 +05:30
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
2020-12-04 05:30:10 +00:00
Vigneshan
44c7affb49 Improve publisher ui to support sso 2020-12-04 10:07:08 +05:30
Vigneshan
6ee1d31a0e Improve store ui to support sso 2020-12-04 10:06:54 +05:30
Vigneshan
0917d3bf7f Improve consent management page to process oidc requests 2020-12-04 10:06:28 +05:30
Vigneshan
f31befb342 Implement oidc based sso among all web apps 2020-12-04 10:06:00 +05:30
Ace
bac6e3ba67 merging with upstream 2020-12-04 07:45:10 +05:30
Ace
cfe206b32c correcting task random candidate election logic 2020-12-04 07:26:29 +05:30
Ace
7734dbd654 Fixing issue with candidate election 2020-12-04 04:43:00 +05:30
Ace
c6db9eeecc adding randomly assigned task functionality and other improvements 2020-12-03 21:09:50 +05:30
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
2020-11-30 18:09:32 +00:00
Dharmakeerthi Lasantha
b1abbf1508 Merge branch 'corrective-policy' into 'corrective-policy'
Add missing error logs to OperationManagerImpl

See merge request entgra/carbon-device-mgt!704
2020-11-30 15:51:53 +00:00
Pahansith Gunathilake
caba7fc673 Add missing error logs to OperationManagerImpl 2020-11-30 15:51:52 +00:00
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
2020-11-30 14:10:15 +00:00
Pahansith
0e4a02635d Add method comments and format code 2020-11-30 16:15:23 +05:30
Pahansith
6e208cde4d Merge branch 'corrective-policy' of https://gitlab.com/entgra/carbon-device-mgt into corrective-policy 2020-11-30 15:42:35 +05:30
Pahansith
e5dd609dc2 Add method comments and format code 2020-11-30 15:41:51 +05:30
Dharmakeerthi Lasantha
ce13b0f131 Merge branch 'corrective-policy' into 'corrective-policy'
Sync with master branch

See merge request entgra/carbon-device-mgt!702
2020-11-30 02:05:05 +00:00
tcdlpds@gmail.com
6b3173332f Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into corrective-policy 2020-11-30 07:33:45 +05:30
charitha
911bd62a44 Fix not adhering 'initiated by' 2020-11-29 10:47:06 +05:30
charitha
31a6497950 Fix enrollment modification issues 2020-11-29 10:47:06 +05:30