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
Charitha Goonetilleke
3b113c9166
Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
...
bug fixing
See merge request entgra/carbon-device-mgt!784
2021-07-15 06:20:00 +00:00
Amalka Subasinghe
f3720e49ff
added scripts and updated config reading
2021-07-15 11:14:20 +05:30
Amalka Subasinghe
bdb01a0098
bug fixing
2021-07-13 22:33:18 +05:30
Charitha Goonetilleke
62b7479653
Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
...
bug fixing authorize flow
See merge request entgra/carbon-device-mgt!783
2021-07-13 05:06:11 +00:00
Amalka Subasinghe
a418fe5d0d
Merge branch 'master' into kernel-4.6.2
2021-07-13 09:29:25 +05:30
Amalka Subasinghe
fc9a9ca210
fixed permission issues
2021-07-13 09:28:30 +05:30
Amalka Subasinghe
510a90a59f
bug fixing authorize flow
2021-07-09 14:46:28 +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
Charitha Goonetilleke
dc1350a565
Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
...
scope-role-permission refactoring and webapp authorization
See merge request entgra/carbon-device-mgt!781
2021-06-28 09:38:08 +00:00
Amalka Subasinghe
52c0e55b07
adding user roles
2021-06-28 14:06:23 +05:30
Amalka Subasinghe
f9a9cff0b9
updated user roles
2021-06-28 13:04:13 +05:30
Amalka Subasinghe
c558cec88e
scope-role-permission refactoring and webapp authorization
2021-06-26 13:53:33 +05:30
Amalka Subasinghe
30a1d92fde
scope-role-permission refactoring and webapp authorization
2021-06-26 13:48:26 +05:30
Amalka Subasinghe
94dd33ffa5
scope-role-permission refactoring and webapp authorization
2021-06-26 13:45:27 +05:30
Amalka Subasinghe
438814eedd
Merge branch 'master' into kernel-4.6.2
2021-06-25 11:09:59 +05:30
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
1d494347a4
Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
...
commented braking changes related to analytics
See merge request entgra/carbon-device-mgt!779
2021-06-22 06:57:04 +00:00
Amalka Subasinghe
51dd72ff79
commented braking changes related to analytics
2021-06-22 11:26:01 +05:30
Charitha Goonetilleke
a35c3e6185
Merge branch 'master' into 'kernel-4.6.x'
...
Update .gitlab-ci.yml
See merge request entgra/carbon-device-mgt!778
2021-06-22 04:52:24 +00:00
Charitha Goonetilleke
c875f89eea
Update .gitlab-ci.yml
2021-06-22 04:43:59 +00:00
Charitha Goonetilleke
1b7db92e91
Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
...
Updating to Kernel 4.6.2
See merge request entgra/carbon-device-mgt!770
2021-06-22 04:30:24 +00:00
Amalka Subasinghe
d090fef2ac
updated from master and added oauth2 component
2021-06-21 21:31:44 +05:30
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
Amalka Subasinghe
23d2b9d767
added claim adding logic to SP
2021-06-11 10:48:33 +05:30
Amalka Subasinghe
293b5f5a7b
updated pom versions to 5.0.0-SNAPSHOT
2021-06-08 12:15:48 +05:30
Amalka Subasinghe
dfb4235a07
fixed sms-config errors
2021-06-07 17:37:20 +05:30
Amalka Subasinghe
b8935487ef
updated sim-config j2 file
2021-06-07 15:20:49 +05:30
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
