Charitha Goonetilleke
|
ee00a00437
|
Merge branch 'support-4.1.15' into 'support-4.1.15'
Add master fixes
See merge request entgra-support/support-carbon-device-mgt!75
|
3 years ago |
Pahansith Gunathilake
|
786f247adc
|
Revert "Fix test failures"
This reverts commit 10b8e0de
|
3 years ago |
Pahansith Gunathilake
|
23dcac5fa7
|
Revert "Add timestamp issue fixes"
This reverts commit 4691b1d7
|
3 years ago |
Pahansith Gunathilake
|
10b8e0de53
|
Fix test failures
|
3 years ago |
Pahansith Gunathilake
|
4691b1d7bd
|
Add timestamp issue fixes
|
3 years ago |
Pahansith Gunathilake
|
cf4f45c89d
|
Change time filtering DB column
|
3 years ago |
Pahansith Gunathilake
|
007b309c71
|
Add time duration filtering to activities EP
|
3 years ago |
Pahansith Gunathilake
|
86495d9ba5
|
Add missing ios scopes into mdm-ui-config.xml
|
3 years ago |
Pahansith Gunathilake
|
b7a098ccf0
|
Merge branch 'support-4.1.15' of gitlab.com:entgra-support/support-carbon-device-mgt into support-4.1.15
|
3 years ago |
Pahansith Gunathilake
|
265241ecfc
|
Merge branch 'support-4.1.15' into 'support-4.1.15'
Add app subscribing feature improvement
See merge request entgra-support/support-carbon-device-mgt!74
|
3 years ago |
lasantha
|
a2ca28dfcb
|
Add app subscribing feature improvement
|
3 years ago |
inoshperera
|
852fa3ad39
|
Remove duplicate app subscriptions
When there are multiple groups on the list, there is a possibility to create multiple subscriptions. The fix is to address this problem. Fixes https://gitlab.com/entgra/product-iots/-/issues/1189
(cherry picked from commit b6c41eabb9 )
|
3 years ago |
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
|
3 years ago |
Charitha Goonetilleke
|
bb8ffe0f5e
|
Allow users with CDM Admin permission to retrieve activities
|
3 years ago |
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
|
3 years ago |
Charitha Goonetilleke
|
73571107b1
|
Add missing initiated by field in operation retrieval
|
3 years ago |
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
|
3 years ago |
Saad Sahibjan
|
b9d889cad6
|
Update device property table in dm db when updating properties
|
3 years ago |
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
|
3 years ago |
Saad Sahibjan
|
4296d874c5
|
Add new device status ASSIGNED
|
3 years ago |
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
|
3 years ago |
Pahansith
|
bf81f36fa6
|
Fix error while adding app install to a device group
(cherry picked from commit d8999cd3a6 )
|
3 years ago |
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
|
3 years ago |
Saad Sahibjan
|
0613396eff
|
Fix having UPPER in query of groups retrieval
|
3 years ago |
Charitha Goonetilleke
|
bc4e76eed7
|
Merge remote-tracking branch 'support/support-4.1.15' into support-4.1.15
|
3 years ago |
Charitha Goonetilleke
|
41cadeb517
|
Fix location update timestamp overwrite issue
|
3 years ago |
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
|
3 years ago |
Muhammad Rashad
|
5795db1360
|
Block Uninstall Policy Feature
(cherry picked from commit 556886daec )
|
3 years ago |
Vigneshan Seshamany
|
36f132d363
|
Improve refresh token handling mechanism
(cherry picked from commit b9d591adb5 )
|
3 years ago |
Vigneshan Seshamany
|
4d2f598529
|
Modify login cache implementatation with LRU cache
(cherry picked from commit 0eb74d9f60 )
|
3 years ago |
Saad Sahibjan
|
aea460c0d5
|
Move slash to a constant
(cherry picked from commit 489aaabc44 )
|
3 years ago |
Saad Sahibjan
|
996309f063
|
Update all children groups when updating a group
(cherry picked from commit ed087e2a0c )
|
3 years ago |
Saad Sahibjan
|
dabc0dc8ec
|
Fix test cases related to hierarchical group changes
(cherry picked from commit 24e69d5492 )
|
3 years ago |
Saad Sahibjan
|
a12b942d86
|
Add and update api layer related to hierarchical changes
(cherry picked from commit e18aa57fe8 )
|
3 years ago |
Saad Sahibjan
|
90d8b94455
|
Add and update service layer related to hierarchical changes
(cherry picked from commit 0ae6c6246a )
|
3 years ago |
Saad Sahibjan
|
3e310d4dbf
|
Add and update dao layer methods related to hierarchical changes
(cherry picked from commit e22d9fd8fc )
|
3 years ago |
Saad Sahibjan
|
5bc39dd7dc
|
Update device group and request beans classes to have new variable
(cherry picked from commit f1892f726d )
|
3 years ago |
Saad Sahibjan
|
abefba8b44
|
Add PARENT_PATH column to DM_GROUP table
(cherry picked from commit e403a92db9 )
|
3 years ago |
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
|
3 years ago |
Vigneshan Seshamany
|
cff28b4d88
|
Improve refresh token handling mechanism
|
3 years ago |
Vigneshan Seshamany
|
d85d2c2272
|
Modify login cache implementatation with LRU cache
|
3 years ago |
navodzoysa
|
2b4ba189c7
|
Fix date range shown in reverse in MDM Reports
(cherry picked from commit 5d23d1d6f6 )
|
3 years ago |
Dharmakeerthi Lasantha
|
bb4780f58a
|
Revert "Merge branch 'master' into 'master'"
This reverts merge request !785
(cherry picked from commit eb13d1b70d )
|
3 years ago |
lasantha
|
a8ec609bb0
|
Improve App subscribing flow
(cherry picked from commit d0ef3beec0 )
|
3 years ago |
Kaveesha
|
07b779323c
|
Add API for get app subscribed device list from a subscription group
(cherry picked from commit d84f642b55 )
|
3 years ago |
Charitha Goonetilleke
|
2b9ef49a52
|
Update .gitlab-ci.yml
(cherry picked from commit c875f89eea )
|
3 years ago |
Kaveesha
|
06eb836f11
|
Update DM_DEVICE_INFO table
(cherry picked from commit e111c1dda8 )
|
3 years ago |
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
|
3 years ago |
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
|
3 years ago |
Farheen99
|
fc67a3eee8
|
Add a query to get the applications sort according to latest timestamp order
(cherry picked from commit 86720b1a45 )
|
4 years ago |