Commit Graph

9429 Commits

Author SHA1 Message Date
Pahansith Gunathilake
9daa745001 Merge branch 'kernel-4.6.x' into 'kernel-4.6.x'
Sync with master

See merge request entgra/carbon-device-mgt!807
2021-10-03 15:49:57 +00:00
Pahansith Gunathilake
26fb28efd9 Merge branch 'k-46x-test-fix-2' into 'kernel-4.6.x'
Fix test cases kernel-4.6.x

See merge request entgra/carbon-device-mgt!800
2021-10-03 15:49:38 +00:00
Pahansith Gunathilake
f22fc7e460 Fix test cases kernel-4.6.x 2021-10-03 15:49:37 +00:00
Saad Sahibjan
b3a229a0e7 Update device property table in dm db when updating properties
(cherry picked from commit 5f64b0b1ad)
2021-10-03 20:52:03 +05:30
Saad Sahibjan
1434a27cde Add new device status ASSIGNED
(cherry picked from commit 68405ed229)
2021-10-03 20:51:58 +05:30
sandaru
eb05fb9a3f Fix web-clip install issue
(cherry picked from commit ebe9842d9a)
2021-10-03 20:51:54 +05:30
Saad Sahibjan
6393276503 Fix having UPPER in query of groups retrieval
(cherry picked from commit 4681447ba9)
2021-10-03 20:51:51 +05:30
Pahansith
9a86d2fe06 Add missing scope for the device info operation button 2021-10-03 20:51:46 +05:30
Pahansith Gunathilake
06935fd5fb Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
fixed issue in updating apis

See merge request entgra/carbon-device-mgt!806
2021-10-01 05:45:43 +00:00
Amalka Subasinghe
7bb616075a fixed issue in updating apis 2021-10-01 11:03:40 +05:30
Pahansith Gunathilake
9bba7edde8 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
updating existing shared scope not required

See merge request entgra/carbon-device-mgt!803
2021-09-24 12:18:01 +00:00
Amalka Subasinghe
de963fa01b updating existing shared scope not required 2021-09-24 15:38:07 +05:30
Pahansith Gunathilake
a960f3b364 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
fixed gw, km, iot, apim urls

See merge request entgra/carbon-device-mgt!801
2021-09-15 16:59:30 +00:00
Amalka Subasinghe
a031579b80 fixed gw, km, iot, apim urls 2021-09-15 15:12:10 +05:30
Pahansith Gunathilake
4b9a962e8d Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
mdm config tags made configurable

See merge request entgra/carbon-device-mgt!796
2021-08-31 09:16:49 +00:00
Amalka Subasinghe
5272293a31 mdm config tags made configurable 2021-08-31 13:17:29 +05:30
Pahansith Gunathilake
d829ba8331 Merge branch 'kernel-4.6.x' into 'kernel-4.6.x'
Fix location update timestamp overwrite issue

See merge request entgra/carbon-device-mgt!795
2021-08-30 04:02:24 +00:00
Pahansith
ee95c8aca1 Fix location update timestamp overwrite issue 2021-08-25 15:09:55 +05:30
Pahansith Gunathilake
e349e9f029 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
fixed tenant enrol issue

See merge request entgra/carbon-device-mgt!794
2021-08-25 03:59:11 +00:00
Amalka Subasinghe
7dc5d7f45d X:Merge branch 'master' into kernel-4.6.2 2021-08-24 15:32:37 +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
Amalka Subasinghe
4203226aa5 fixed tenant enrol issue 2021-08-24 15:08:38 +05:30
Pahansith
d8999cd3a6 Fix error while adding app install to a device group 2021-08-24 13:06:37 +05:30
Pahansith Gunathilake
ff747fa797 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
changes done to fix tenant login issue

See merge request entgra/carbon-device-mgt!792
2021-08-17 09:17:51 +00:00
Amalka Subasinghe
eae469fbc5 tenant login issue fixed 2021-08-17 09:53:41 +05:30
Pahansith Gunathilake
6bb8938ee1 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
Bug fixes and package name change in appmgt

See merge request entgra/carbon-device-mgt!791
2021-08-11 05:28:38 +00:00
Amalka Subasinghe
29b561e9c3 added config to j2 file 2021-08-10 22:00:15 +05:30
Amalka Subasinghe
39b26d58dc removed unused dependecies 2021-08-10 17:48:41 +05:30
Amalka Subasinghe
4503ab77c7 package name change - appmgt 2021-08-10 17:30:48 +05:30
Amalka Subasinghe
8a07dad38c package name change - appmgt common 2021-08-10 16:56:19 +05:30
Amalka Subasinghe
37b08ba389 package name change - appmgt core 2021-08-10 16:48:15 +05:30
Amalka Subasinghe
16af7a44b5 package name change - appmgt addons 2021-08-10 16:15:59 +05:30
Amalka Subasinghe
4de4a15359 package name change - appmgt api 2021-08-10 16:13:23 +05:30
Amalka Subasinghe
a57043b5c1 package name change - appmgt publisher api 2021-08-10 16:07:17 +05:30
Amalka Subasinghe
d6c04ca928 package name change - appmgt store api 2021-08-10 16:02:47 +05:30
Amalka Subasinghe
f7f8ce535a fixed issue - product-iots #1059 2021-08-10 12:39:58 +05:30
Pahansith Gunathilake
2e40a4dc02 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
Update from master branch

See merge request entgra/carbon-device-mgt!790
2021-08-03 06:57:34 +00:00
Amalka Subasinghe
f9274b0d1a update from master 2021-08-02 11:18:15 +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
Amalka Subasinghe
88d305c1b1 Merge branch 'master' into kernel-4.6.2 2021-07-26 09:51:18 +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