Commit Graph

9359 Commits

Author SHA1 Message Date
Charitha Goonetilleke
877192368b Merge branch 'master' into 'master'
Update device property table in dm db when updating properties

See merge request entgra/carbon-device-mgt!804
2021-09-26 06:42:37 +00:00
Saad Sahibjan
5f64b0b1ad Update device property table in dm db when updating properties 2021-09-26 11:57:01 +05:30
Charitha Goonetilleke
de9b9afe2e Merge branch 'master' into 'master'
Add new device status ASSIGNED

See merge request entgra/carbon-device-mgt!802
2021-09-24 03:47:42 +00:00
Saad Sahibjan
68405ed229 Add new device status ASSIGNED 2021-09-23 18:46:11 +05:30
Pahansith Gunathilake
98209deade Merge branch 'web_clip' into 'master'
Fix web-clip install issue

See merge request entgra/carbon-device-mgt!798
2021-09-23 06:11:58 +00:00
sandaru
ebe9842d9a Fix web-clip install issue 2021-09-13 14:18:29 +05:30
Charitha Goonetilleke
eee60cec89 Merge branch 'master' into 'master'
Fix having UPPER in query of groups retrieval

See merge request entgra/carbon-device-mgt!797
2021-09-09 16:52:11 +00:00
Saad Sahibjan
4681447ba9 Fix having UPPER in query of groups retrieval 2021-09-09 17:23:40 +05:30
Pahansith Gunathilake
dc0fb2e40d Merge branch 'app-install-1' into 'master'
Fix error while adding app install to a device group

See merge request entgra/carbon-device-mgt!793
2021-08-24 09:58:09 +00:00
Pahansith
d8999cd3a6 Fix error while adding app install to a device group 2021-08-24 13:06:37 +05:30
Pahansith Gunathilake
76deadcf41 Merge branch 'master' into 'master'
Login cache improvements and Refresh token handling improvements

See merge request entgra/carbon-device-mgt!789
2021-08-02 05:11:19 +00:00
Pahansith Gunathilake
dc6856fc0e Merge branch 'master' into 'master'
Block Uninstall Policy Feature

See merge request entgra/carbon-device-mgt!787
2021-08-02 05:09:51 +00:00
Muhammad Rashad
556886daec Block Uninstall Policy Feature 2021-08-02 05:09:51 +00:00
Pahansith Gunathilake
939e9faeff Merge branch 'hierarchical-grouping' into 'master'
Hierarchical grouping

See merge request entgra/carbon-device-mgt!780
2021-08-02 05:00:17 +00:00
vigneshan
b9d591adb5 Improve refresh token handling mechanism 2021-07-29 10:46:41 +05:30
vigneshan
0eb74d9f60 Modify login cache implementatation with LRU cache 2021-07-29 10:46:41 +05:30
Pahansith Gunathilake
4cfd56efa0 Merge branch 'master' into 'master'
Fix date range shown in reverse in MDM Reports

See merge request entgra/carbon-device-mgt!788
2021-07-23 04:25:30 +00:00
navodzoysa
5d23d1d6f6 Fix date range shown in reverse in MDM Reports 2021-07-21 21:34:42 +05:30
Dharmakeerthi Lasantha
b9dc7785b3 Merge branch 'revert-52ce2907' into 'master'
Revert APPM subscription improvement

See merge request entgra/carbon-device-mgt!786
2021-07-19 14:58:14 +00:00
Dharmakeerthi Lasantha
eb13d1b70d Revert "Merge branch 'master' into 'master'"
This reverts merge request !785
2021-07-19 10:18:32 +00:00
Saad Sahibjan
52ce29076a Merge branch 'master' into 'master'
Improve App subscribing flow

See merge request entgra/carbon-device-mgt!785
2021-07-16 17:18:57 +00:00
lasantha
d0ef3beec0 Improve App subscribing flow 2021-07-16 19:53:56 +05:30
Saad Sahibjan
489aaabc44 Move slash to a constant 2021-07-16 00:13:30 +05:30
Saad Sahibjan
ed087e2a0c Update all children groups when updating a group 2021-07-15 21:37:36 +05:30
Saad Sahibjan
24d57d2e96 Merge branch 'master' into 'master'
Add API for get app subscribed device list from a subscription group

Closes product-iots#1035

See merge request entgra/carbon-device-mgt!782
2021-07-08 11:08:55 +00:00
Kaveesha
d84f642b55 Add API for get app subscribed device list from a subscription group 2021-07-07 00:58:07 +05:30
Pahansith Gunathilake
c2dd2130b4 Merge branch 'master' into 'master'
Update DM_DEVICE_INFO table

See merge request entgra/carbon-device-mgt!776
2021-07-06 09:51:15 +00:00
Saad Sahibjan
24e69d5492 Fix test cases related to hierarchical group changes 2021-06-24 21:06:30 +05:30
Saad Sahibjan
e18aa57fe8 Add and update api layer related to hierarchical changes 2021-06-24 20:46:44 +05:30
Saad Sahibjan
0ae6c6246a Add and update service layer related to hierarchical changes 2021-06-24 20:46:44 +05:30
Saad Sahibjan
e22d9fd8fc Add and update dao layer methods related to hierarchical changes 2021-06-24 20:46:44 +05:30
Saad Sahibjan
f1892f726d Update device group and request beans classes to have new variable 2021-06-24 20:46:44 +05:30
Saad Sahibjan
e403a92db9 Add PARENT_PATH column to DM_GROUP table 2021-06-24 20:46:44 +05:30
Charitha Goonetilleke
c875f89eea Update .gitlab-ci.yml 2021-06-22 04:43:59 +00:00
Pahansith Gunathilake
6c530abb69 Merge branch 'SimRes' into 'master'
Add default sim update operation scope

See merge request entgra/carbon-device-mgt!777
2021-06-15 05:28:02 +00:00
sandaru
8f689c8101 Add default sim update operation scope
https://gitlab.com/entgra/product-iots/-/issues/991
2021-06-14 14:46:36 +05:30
Pahansith Gunathilake
feb8f9ca38 Merge branch 'issue-work-scope' into 'master'
[SBAC] - Add changes to use a newly added scope element in android.xml

Closes product-iots#985 and product-iots#937

See merge request entgra/carbon-device-mgt!771
2021-06-14 08:08:42 +00:00
Charitha Goonetilleke
89ae048a5d Merge branch 'geo-view' into 'master'
Add geo view API

See merge request entgra/carbon-device-mgt!775
2021-06-06 04:12:09 +00:00
Pahansith Gunathilake
0aacc39505 Merge branch 'sso' into 'master'
Increasing the session time for 1h.

Closes product-iots#905

See merge request entgra/carbon-device-mgt!774
2021-06-04 14:43:29 +00:00
MalshaPiumini
a1567d8a3d Increase session time for sso and non-sso login. 2021-06-04 11:20:25 +05:30
Pahansith Gunathilake
a136fa4901 Merge branch 'master' into 'master'
Fix session expire issue during sso authorization

See merge request entgra/carbon-device-mgt!766
2021-06-01 09:50:57 +00:00
Kaveesha
e111c1dda8 Update DM_DEVICE_INFO table 2021-06-01 10:49:45 +05:30
Pahansith Gunathilake
bc680df8e5 Merge branch 'revert-70ac1926' into 'master'
Revert Merge request : https://gitlab.com/entgra/carbon-device-mgt/-/merge_requests/769/

See merge request entgra/carbon-device-mgt!773
2021-06-01 02:58:09 +00:00
Pahansith Gunathilake
dbe9eecc83 Merge branch 'issue900' into 'master'
Support AE with QR code based enrollment

See merge request entgra/carbon-device-mgt!772
2021-05-26 04:45:13 +00:00
charitha
3a17cb2329 Consider not now operations as pending 2021-05-24 21:41:09 +05:30
Dharmakeerthi Lasantha
75dc57165c Merge branch 'issue-works-868-NN' into 'master'
[App New Release] - Add a query get the applications sort according to latest timestamp order

Closes product-iots#868

See merge request entgra/carbon-device-mgt!761
2021-05-22 03:59:37 +00:00
Pahansith Gunathilake
22dc7aaf25 Revert "Merge branch 'invoker' into 'master'"
This reverts merge request !769
2021-05-21 13:22:25 +00:00
charithag
e5fb17aceb Add geo view API 2021-05-19 17:12:50 +05:30
inoshperera
2f73bcb0c7 Support AE with QR code based enrollment
Fixes https://gitlab.com/entgra/emm-proprietary-plugins/-/merge_requests/601
2021-05-17 12:04:21 +05:30
Farheen99
5ac273f362 Add code changes to read a new xml element named scope from android.xml file 2021-05-16 20:31:50 +05:30