Commit Graph

1765 Commits

Author SHA1 Message Date
MalshaPiumini
12ebc03d12 Increase session time for sso and non-sso login.
(cherry picked from commit a1567d8a3d)
2021-06-10 21:41:19 +05:30
charithag
9419eef7f9 Add geo view API
(cherry picked from commit e5fb17aceb)
2021-06-10 21:41:12 +05:30
charitha
e824091396 Consider not now operations as pending 2021-05-24 21:17:24 +05:30
Inosh Perara
14e5ceb5f2 Merge branch 'support-4.1.15' into 'support-4.1.15'
Sync with master fixes

See merge request entgra-support/support-carbon-device-mgt!51
2021-05-12 08:33:04 +00:00
MalshaPiumini
fd6947fffc Formatting the SQL query.
(cherry picked from commit 6f325862ec)
2021-05-10 13:23:55 +05:30
MalshaPiumini
3b09a43d85 Solved test case failure.
(cherry picked from commit 60b59f455d)
2021-05-10 13:23:52 +05:30
MalshaPiumini
d16a7a7fb8 Added device filter using serial number.
(cherry picked from commit b2691996ab)
2021-05-10 13:23:48 +05:30
charithag
a16c82bebd Allow dynamic control of operations 2021-05-07 17:47:25 +05:30
MalshaPiumini
fc67e8b7aa Added new filter in subscription details page
(cherry picked from commit dca6b53a67)
2021-05-06 21:35:23 +05:30
MalshaPiumini
82ebe79f2d Code modified
(cherry picked from commit 605168e770)
2021-05-06 21:35:14 +05:30
MalshaPiumini
8793b413af Device search in store uninstall modal
(cherry picked from commit 74c4f1004a)
2021-05-06 21:35:05 +05:30
Pahansith
cfeeb85387 Fix app schedule installation issue in single node
(cherry picked from commit 365b073e6a)
2021-04-23 21:37:59 +05:30
Charitha Goonetilleke
1b1085fda8 Fix executing policy monitoring continuously
(cherry picked from commit 99e5f9f876)
2021-04-20 02:06:41 +05:30
Farheen Boosary
6a7099f97f Handle execution of queries contain IN clause with empty array
(cherry picked from commit 0f39b2f253)
2021-04-02 08:47:02 +05:30
inoshperera
190c896a86 Fix wrong zip codes from agents persisting 2021-03-24 19:15:33 +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