Commit Graph

9184 Commits

Author SHA1 Message Date
Pahansith
a7e6b64f70 Fix review issues and format code 2021-01-20 18:05:23 +05:30
Inosh Perara
d0f68babc4 Merge branch 'master' into 'master'
Add access token retrieving service

See merge request entgra/carbon-device-mgt!718
2021-01-19 06:22:07 +00:00
tcdlpds@gmail.com
7333329e78 Add access token retrieving service 2021-01-19 11:25:42 +05:30
charitha
ad4d7a453f Fix NPE occur when updating device with null status 2021-01-18 22:16:52 +05:30
Dharmakeerthi Lasantha
44b2621381 Merge branch 'master' into 'master'
Modify DeviceTypeCommonService

See merge request entgra/carbon-device-mgt!717
2021-01-18 10:39:57 +00:00
tcdlpds@gmail.com
b4d7497022 Modify DeviceTypeCommonService 2021-01-16 20:57:59 +05:30
Inosh Perara
8278f8c011 Merge branch 'master' into 'master'
Fix iOS app download path

See merge request entgra/carbon-device-mgt!716
2021-01-16 04:07:32 +00:00
inoshperera
b481150ee9 Fix iOS app download path 2021-01-16 08:53:12 +05:30
Dharmakeerthi Lasantha
03ccee4425 Merge branch 'master' into 'master'
Improve sso ui-request-interceptor to update application as SaaS app

See merge request entgra/carbon-device-mgt!715
2021-01-13 05:15:25 +00:00
vigneshan
52407ba312 Improve sso ui-request-interceptor to update application as SaaS app 2021-01-13 10:28:07 +05:30
Charitha Goonetilleke
8e6ab9d8cd Merge branch 'master' into 'master'
Add Activity ID for repeated operation

See merge request entgra/carbon-device-mgt!714
2021-01-11 04:03:12 +00:00
charitha
864bbcdc83 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2021-01-11 09:15:04 +05:30
charitha
2bdaf4186b Add Activity ID for repeated operation 2021-01-11 09:13:54 +05:30
Dharmakeerthi Lasantha
d627bfc6c3 Merge branch 'uninstall' into 'master'
Uninstall applications via Apps Tab - (For Android devices only)

See merge request entgra/carbon-device-mgt!700
2021-01-06 19:07:10 +00:00
Malsha Piumini
89298f933e Uninstall applications via Apps Tab - (For Android devices only) 2021-01-06 19:07:09 +00:00
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