Commit Graph

9313 Commits

Author SHA1 Message Date
Kaveesha
06eb836f11 Update DM_DEVICE_INFO table
(cherry picked from commit e111c1dda8)
2021-07-29 02:41:07 +05:30
Pahansith Gunathilake
b193627c87 Merge branch 'support-4.1.15' into 'support-4.1.15'
Sync with master

See merge request entgra-support/support-carbon-device-mgt!56
2021-07-26 18:56:21 +00:00
Pahansith Gunathilake
963fb6d628 Merge branch 'support-4.1.15' into 'support-4.1.15'
# Conflicts:
#   components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/util/HandlerConstants.java
#   features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
2021-07-26 18:38:30 +00:00
Farheen99
fc67a3eee8 Add a query to get the applications sort according to latest timestamp order
(cherry picked from commit 86720b1a45)
2021-06-21 19:09:47 +05:30
sandaru
4810ceb0d0 Add default sim update operation scope
https://gitlab.com/entgra/product-iots/-/issues/991
(cherry picked from commit 8f689c8101)
2021-06-21 19:07:39 +05:30
charithag
25ca3d22e8 Add geo view API
(cherry picked from commit e5fb17aceb)
2021-06-21 19:07:08 +05:30
Kaveesha
bcab5f3bfe Update item bean class to get documentation link from xml
(cherry picked from commit 6c947962d6)
2021-06-21 19:06:55 +05:30
Pahansith Gunathilake
c23d0026ea Merge branch 'support-4.1.15-new' into 'support-4.1.15'
Sync with master fixes

See merge request entgra-support/support-carbon-device-mgt!57
2021-06-16 10:47:36 +00:00
Farheen99
726d37847f Add code changes to read a new xml element named scope from android.xml file
(cherry picked from commit 5ac273f362)
2021-06-16 16:12:30 +05:30
MalshaPiumini
0c3185f7d6 Increase session time for sso and non-sso login.
(cherry picked from commit a1567d8a3d)
2021-06-16 16:12:18 +05:30
inoshperera
83047b497f Support AE with QR code based enrollment
Fixes https://gitlab.com/entgra/emm-proprietary-plugins/-/merge_requests/601

(cherry picked from commit 2f73bcb0c7)
2021-06-16 16:12:02 +05:30
vigneshan
f725151e91 Fix session expire issue during sso authorization
(cherry picked from commit c2369cde71)
2021-06-16 16:11:44 +05:30
Pahansith
b68d24cec4 Add session scope handler
(cherry picked from commit 429e76cfdc)
2021-06-16 16:11:38 +05:30
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
inoshperera
554e20e389 Support AE with QR code based enrollment
Fixes https://gitlab.com/entgra/emm-proprietary-plugins/-/merge_requests/601

(cherry picked from commit 2f73bcb0c7)
2021-06-10 21:41:06 +05:30
Kaveesha
233f09a676 Update item bean class to get documentation link from xml
(cherry picked from commit 6c947962d6)
2021-06-10 21:40:39 +05:30
vigneshan
19268aaa5b Fix session expire issue during sso authorization
(cherry picked from commit c2369cde71)
2021-06-10 21:40:23 +05:30
Pahansith
f64007bcc8 Add session scope handler
(cherry picked from commit 429e76cfdc)
2021-06-10 21:38:06 +05:30
Farheen99
3816e09b1d Add a query to get the applications sort according to latest timestamp order
(cherry picked from commit 86720b1a45)
2021-06-10 21:37:55 +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
charithag
c5e26804dc Add NOTNOW status to activity result 2021-05-07 14:14:37 +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
4664bb24e5 Added validations
(cherry picked from commit 645fc43136)
2021-05-06 21:35:17 +05:30
MalshaPiumini
82ebe79f2d Code modified
(cherry picked from commit 605168e770)
2021-05-06 21:35:14 +05:30
MalshaPiumini
f3d1ad4f0d Device search in store subscription details page
(cherry picked from commit c2940a4568)
2021-05-06 21:35:10 +05:30
MalshaPiumini
8793b413af Device search in store uninstall modal
(cherry picked from commit 74c4f1004a)
2021-05-06 21:35:05 +05:30
Pahansith
9b8894240e Add DAO fix for app schedule subscription
(cherry picked from commit 0060083499)
2021-05-06 21:34:53 +05:30
Inosh Perara
34465294f5 Merge branch 'support-4.1.15' into 'support-4.1.15'
Sync with master changes

See merge request entgra-support/support-carbon-device-mgt!50
2021-04-29 02:57:40 +00:00
Pahansith
e50da86bdb Fix schedule install DAO issue
(cherry picked from commit 4dee16dffb)
2021-04-28 20:09:47 +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
vigneshan
555d2398fe Fix token refresh issue
(cherry picked from commit 10166069d3)
2021-04-23 21:37:34 +05:30
Pahansith Gunathilake
6ce53f55b1 Merge branch 'support-4.1.15' into 'support-4.1.15'
Fix executing policy monitoring continuously

See merge request entgra-support/support-carbon-device-mgt!48
2021-04-19 21:31:02 +00:00
Charitha Goonetilleke
1b1085fda8 Fix executing policy monitoring continuously
(cherry picked from commit 99e5f9f876)
2021-04-20 02:06:41 +05:30
Pahansith Gunathilake
ae92a985fa Merge branch 'support-4.1.15' into 'support-4.1.15'
Fix error in unmanaged app uninstall

See merge request entgra-support/support-carbon-device-mgt!46
2021-04-02 14:02:56 +00:00
vigneshan
143d62efd5 Add login cache for sso and non-sso flow
(cherry picked from commit 872299a617)
2021-04-02 08:47:08 +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
4394ceaeed Add enterprise API tag to allowed tags
(cherry picked from commit 4116b7776b)
2021-04-02 08:46:55 +05:30
Inosh Perara
836a6e8001 Merge branch 'support-4.1.15' into 'support-4.1.15'
Add enterprise API tag to allowed tags

See merge request entgra-support/support-carbon-device-mgt!47
2021-03-29 05:28:05 +00:00
inoshperera
573d1f2e6c Add enterprise API tag to allowed tags 2021-03-29 10:44:11 +05:30
Pahansith
e6257482de Fix error in unmanaged app uninstall 2021-03-26 15:12:26 +05:30
inoshperera
190c896a86 Fix wrong zip codes from agents persisting 2021-03-24 19:15:33 +05:30
inoshperera
0e7c445a56 Add token expiry time to QR payload 2021-03-18 15:33:09 +05:30
Entgra Builder
09907233fc [maven-release-plugin] prepare release v4.1.15 2021-03-03 13:54:27 +00:00
Dharmakeerthi Lasantha
5a8779a40a Merge branch 'master' into 'master'
Fix app subscription adding issue for removed devices

Closes product-iots#742

See merge request entgra/carbon-device-mgt!744
2021-03-03 05:00:23 +00:00