Commit Graph

1753 Commits

Author SHA1 Message Date
MalshaPiumini
dca6b53a67 Added new filter in subscription details page 2021-03-23 14:50:36 +05:30
MalshaPiumini
605168e770 Code modified 2021-03-17 18:37:14 +05:30
MalshaPiumini
74c4f1004a Device search in store uninstall modal 2021-03-16 16:08:21 +05:30
tcdlpds@gmail.com
9f76c003a6 Fix app subscription adding issue for removed devices 2021-03-03 09:58:04 +05:30
Dharmakeerthi Lasantha
8c50af1631 Merge branch 'master' into 'master'
Fix FCM and configuration fetching issues

See merge request entgra/carbon-device-mgt!742
2021-03-02 01:05:53 +00:00
inoshperera
28e0c88222 Fix FCM and configuration fetching issues 2021-02-27 10:02:19 +05:30
charitha
0435138fc9 Fix issue with updating status due to cache inconsistency 2021-02-26 14:57:16 +05:30
Dharmakeerthi Lasantha
d4aaf3ce4b Merge branch 'sync_fix' into 'master'
Fix issue in enrollment object modification

See merge request entgra/carbon-device-mgt!741
2021-02-23 15:16:04 +00:00
inoshperera
bfd1f794de Fix issue in enrollment object modification 2021-02-23 19:34:21 +05:30
Pahansith
e1afa53560 Fix geofence update issue 2021-02-22 11:21:24 +05:30
charithag
31dc6fc839 Fix NPE 2021-02-19 01:21:20 +05:30
Dharmakeerthi Lasantha
7e088ea747 Merge branch 'sync_fix' into 'master'
Fix cache not updating

See merge request entgra/carbon-device-mgt!734
2021-02-18 03:35:20 +00:00
inoshperera
4f88c2354c Fix cache not updating 2021-02-18 08:48:29 +05:30
Dharmakeerthi Lasantha
6f4e8a3688 Merge branch 'sync_fix' into 'master'
Fix for sycning status update in Android

See merge request entgra/carbon-device-mgt!733
2021-02-17 11:00:37 +00:00
inoshperera
8effa09a8f Fix for sycning status update in Android 2021-02-17 15:51:33 +05:30
shamalka
1faee050af Remove commented code lines 2021-02-12 22:58:36 +05:30
shamalka
72edb6c323 Accept multiple device status in store API 2021-02-12 22:56:31 +05:30
Dharmakeerthi Lasantha
ce80f4efe0 Merge branch 'event-modify-branch-1' into 'master'
Code format of event task operation

See merge request entgra/carbon-device-mgt!728
2021-02-11 06:32:05 +00:00
Pahansith
4cc670a614 Format code 2021-02-11 10:54:57 +05:30
Charitha Goonetilleke
1e2afa6439 Merge branch 'event-modify-branch-1' into 'master'
Modify event creation task

See merge request entgra/carbon-device-mgt!725
2021-02-10 09:38:26 +00:00
Pahansith
9ef6cfc1e6 Move executor pool to the DeviceManagementDataHolder 2021-02-10 14:48:20 +05:30
Pahansith
2fa4a6167e Fix test failures 2021-02-10 01:37:00 +05:30
Pahansith
0cbcd747d5 Modify event operation creation 2021-02-10 01:12:13 +05:30
tcdlpds@gmail.com
7b41e2cd0d Fix EULA loading issue for tenants
Fix registry loading issue when SSO has enabled. Because of that issue device type EULA displaying page is broken
2021-02-06 19:38:46 +05:30
Pahansith
a7e6b64f70 Fix review issues and format code 2021-01-20 18:05:23 +05:30
charitha
ad4d7a453f Fix NPE occur when updating device with null status 2021-01-18 22:16:52 +05:30
charitha
2bdaf4186b Add Activity ID for repeated operation 2021-01-11 09:13:54 +05:30
charitha
9a2792dd31 Fix issue in not updating operation response for non-removed devices 2020-12-21 13:25:32 +05:30
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
Pahansith
931fb8ef54 Add windows agent token generation parameters to config API 2020-12-16 21:16:38 +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
charitha
4943635a61 Fetch enrollment Id if it is not already in the device 2020-12-12 03:01:56 +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
tcdlpds@gmail.com
087b826d29 Improve information logging 2020-12-09 16:57:15 +05:30
Shamalka Navod
eccb39d6f4 Improve metadata API 2020-12-07 20:15:18 +00:00
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
Ace
bac6e3ba67 merging with upstream 2020-12-04 07:45:10 +05:30
Ace
c6db9eeecc adding randomly assigned task functionality and other improvements 2020-12-03 21:09:50 +05:30
Pahansith Gunathilake
caba7fc673 Add missing error logs to OperationManagerImpl 2020-11-30 15:51:52 +00:00
Pahansith
e5dd609dc2 Add method comments and format code 2020-11-30 15:41:51 +05:30
charitha
911bd62a44 Fix not adhering 'initiated by' 2020-11-29 10:47:06 +05:30
charitha
10d114ba1e Improve activity retrieval logic 2020-11-29 10:47:05 +05:30
Ace
9d39197844 Adding improvements to dynamic task allocation 2020-11-26 19:16:49 +05:30
Pahansith
a3629d5932 Add group data into geofence response, Format code 2020-11-21 12:24:55 +05:30
Pahansith
8c80185610 Add doc comments and format code 2020-11-21 12:22:53 +05:30
Pahansith
d9d0ba5d90 Add event delete API 2020-11-21 12:22:53 +05:30