Commit Graph

9348 Commits

Author SHA1 Message Date
lasantha
a2ca28dfcb Add app subscribing feature improvement 2021-11-26 17:03:20 +05:30
Charitha Goonetilleke
a0c953d027 Merge branch 'support-4.1.15' into 'support-4.1.15'
Allow users with CDM Admin permission to retrieve activities

See merge request entgra-support/support-carbon-device-mgt!73
2021-11-05 15:16:09 +00:00
charithag
bb8ffe0f5e Allow users with CDM Admin permission to retrieve activities 2021-11-05 20:44:06 +05:30
Charitha Goonetilleke
58959705c6 Merge branch 'support-4.1.15' into 'support-4.1.15'
Add missing initiated by field in operation retrieval

See merge request entgra-support/support-carbon-device-mgt!72
2021-11-04 15:53:01 +00:00
charithag
73571107b1 Add missing initiated by field in operation retrieval 2021-11-04 07:55:47 +05:30
Charitha Goonetilleke
1d3f6fdac9 Merge branch 'support-4.1.15' into 'support-4.1.15'
Update device property table in dm db when updating properties

See merge request entgra-support/support-carbon-device-mgt!71
2021-09-26 04:11:34 +00:00
Saad Sahibjan
b9d889cad6 Update device property table in dm db when updating properties 2021-09-25 18:58:23 +05:30
Charitha Goonetilleke
4bb356cae1 Merge branch 'support-4.1.15' into 'support-4.1.15'
Add new device status ASSIGNED

See merge request entgra-support/support-carbon-device-mgt!70
2021-09-24 03:47:30 +00:00
Saad Sahibjan
4296d874c5 Add new device status ASSIGNED 2021-09-23 18:46:55 +05:30
Pahansith Gunathilake
b213742642 Merge branch 'support-4.1.15' into 'support-4.1.15'
Fix error while adding app install to a device group

See merge request entgra-support/support-carbon-device-mgt!69
2021-09-23 07:11:27 +00:00
Pahansith
bf81f36fa6 Fix error while adding app install to a device group
(cherry picked from commit d8999cd3a6)
2021-09-18 08:12:25 +05:30
Charitha Goonetilleke
51e1bc002c Merge branch 'support-4.1.15' into 'support-4.1.15'
Fix having UPPER in query of groups retrieval

See merge request entgra-support/support-carbon-device-mgt!68
2021-09-09 16:52:26 +00:00
Saad Sahibjan
0613396eff Fix having UPPER in query of groups retrieval 2021-09-09 17:28:19 +05:30
charitha
bc4e76eed7 Merge remote-tracking branch 'support/support-4.1.15' into support-4.1.15 2021-08-25 10:56:30 +05:30
charitha
41cadeb517 Fix location update timestamp overwrite issue 2021-08-25 10:56:16 +05:30
Pahansith Gunathilake
6dbc6dd0a1 Merge branch 'support-4.1.15' into 'support-4.1.15'
Sync with master

See merge request entgra-support/support-carbon-device-mgt!67
2021-08-21 15:12:26 +00:00
Muhammad Rashad
5795db1360 Block Uninstall Policy Feature
(cherry picked from commit 556886daec)
2021-08-21 13:14:10 +05:30
vigneshan
36f132d363 Improve refresh token handling mechanism
(cherry picked from commit b9d591adb5)
2021-08-21 13:14:07 +05:30
vigneshan
4d2f598529 Modify login cache implementatation with LRU cache
(cherry picked from commit 0eb74d9f60)
2021-08-21 13:14:03 +05:30
Saad Sahibjan
aea460c0d5 Move slash to a constant
(cherry picked from commit 489aaabc44)
2021-08-21 13:13:55 +05:30
Saad Sahibjan
996309f063 Update all children groups when updating a group
(cherry picked from commit ed087e2a0c)
2021-08-21 13:12:08 +05:30
Saad Sahibjan
dabc0dc8ec Fix test cases related to hierarchical group changes
(cherry picked from commit 24e69d5492)
2021-08-21 13:12:04 +05:30
Saad Sahibjan
a12b942d86 Add and update api layer related to hierarchical changes
(cherry picked from commit e18aa57fe8)
2021-08-21 13:12:00 +05:30
Saad Sahibjan
90d8b94455 Add and update service layer related to hierarchical changes
(cherry picked from commit 0ae6c6246a)
2021-08-21 13:11:55 +05:30
Saad Sahibjan
3e310d4dbf Add and update dao layer methods related to hierarchical changes
(cherry picked from commit e22d9fd8fc)
2021-08-21 13:11:52 +05:30
Saad Sahibjan
5bc39dd7dc Update device group and request beans classes to have new variable
(cherry picked from commit f1892f726d)
2021-08-21 13:11:49 +05:30
Saad Sahibjan
abefba8b44 Add PARENT_PATH column to DM_GROUP table
(cherry picked from commit e403a92db9)
2021-08-21 13:11:35 +05:30
Charitha Goonetilleke
fc34595cfd Merge branch 'support-4.1.15' into 'support-4.1.15'
Login caching fixes and refresh token improvements

See merge request entgra-support/support-carbon-device-mgt!66
2021-08-01 16:31:37 +00:00
vigneshan
cff28b4d88 Improve refresh token handling mechanism 2021-07-29 15:31:51 +05:30
vigneshan
d85d2c2272 Modify login cache implementatation with LRU cache 2021-07-29 15:31:51 +05:30
navodzoysa
2b4ba189c7 Fix date range shown in reverse in MDM Reports
(cherry picked from commit 5d23d1d6f6)
2021-07-29 02:42:36 +05:30
Dharmakeerthi Lasantha
bb4780f58a Revert "Merge branch 'master' into 'master'"
This reverts merge request !785

(cherry picked from commit eb13d1b70d)
2021-07-29 02:42:32 +05:30
lasantha
a8ec609bb0 Improve App subscribing flow
(cherry picked from commit d0ef3beec0)
2021-07-29 02:41:21 +05:30
Kaveesha
07b779323c Add API for get app subscribed device list from a subscription group
(cherry picked from commit d84f642b55)
2021-07-29 02:41:18 +05:30
Charitha Goonetilleke
2b9ef49a52 Update .gitlab-ci.yml
(cherry picked from commit c875f89eea)
2021-07-29 02:41:14 +05:30
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