Dharmakeerthi Lasantha
eb13d1b70d
Revert "Merge branch 'master' into 'master'"
...
This reverts merge request !785
3 years ago
Saad Sahibjan
52ce29076a
Merge branch 'master' into 'master'
...
Improve App subscribing flow
See merge request entgra/carbon-device-mgt!785
3 years ago
lasantha
d0ef3beec0
Improve App subscribing flow
3 years ago
Saad Sahibjan
489aaabc44
Move slash to a constant
3 years ago
Saad Sahibjan
ed087e2a0c
Update all children groups when updating a group
3 years ago
Charitha Goonetilleke
3b113c9166
Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
...
bug fixing
See merge request entgra/carbon-device-mgt!784
3 years ago
Amalka Subasinghe
f3720e49ff
added scripts and updated config reading
3 years ago
Amalka Subasinghe
bdb01a0098
bug fixing
3 years ago
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
3 years ago
Amalka Subasinghe
a418fe5d0d
Merge branch 'master' into kernel-4.6.2
3 years ago
Amalka Subasinghe
fc9a9ca210
fixed permission issues
3 years ago
Amalka Subasinghe
510a90a59f
bug fixing authorize flow
3 years ago
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
3 years ago
Kaveesha
d84f642b55
Add API for get app subscribed device list from a subscription group
3 years ago
Pahansith Gunathilake
c2dd2130b4
Merge branch 'master' into 'master'
...
Update DM_DEVICE_INFO table
See merge request entgra/carbon-device-mgt!776
3 years ago
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
3 years ago
Amalka Subasinghe
52c0e55b07
adding user roles
3 years ago
Amalka Subasinghe
f9a9cff0b9
updated user roles
3 years ago
Amalka Subasinghe
c558cec88e
scope-role-permission refactoring and webapp authorization
3 years ago
Amalka Subasinghe
30a1d92fde
scope-role-permission refactoring and webapp authorization
3 years ago
Amalka Subasinghe
94dd33ffa5
scope-role-permission refactoring and webapp authorization
3 years ago
Amalka Subasinghe
438814eedd
Merge branch 'master' into kernel-4.6.2
3 years ago
Saad Sahibjan
24e69d5492
Fix test cases related to hierarchical group changes
3 years ago
Saad Sahibjan
e18aa57fe8
Add and update api layer related to hierarchical changes
3 years ago
Saad Sahibjan
0ae6c6246a
Add and update service layer related to hierarchical changes
3 years ago
Saad Sahibjan
e22d9fd8fc
Add and update dao layer methods related to hierarchical changes
3 years ago
Saad Sahibjan
f1892f726d
Update device group and request beans classes to have new variable
3 years ago
Saad Sahibjan
e403a92db9
Add PARENT_PATH column to DM_GROUP table
3 years ago
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
3 years ago
Amalka Subasinghe
51dd72ff79
commented braking changes related to analytics
3 years ago
Charitha Goonetilleke
a35c3e6185
Merge branch 'master' into 'kernel-4.6.x'
...
Update .gitlab-ci.yml
See merge request entgra/carbon-device-mgt!778
3 years ago
Charitha Goonetilleke
c875f89eea
Update .gitlab-ci.yml
3 years ago
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
3 years ago
Amalka Subasinghe
d090fef2ac
updated from master and added oauth2 component
3 years ago
Pahansith Gunathilake
6c530abb69
Merge branch 'SimRes' into 'master'
...
Add default sim update operation scope
See merge request entgra/carbon-device-mgt!777
3 years ago
sandaru
8f689c8101
Add default sim update operation scope
...
https://gitlab.com/entgra/product-iots/-/issues/991
3 years ago
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
3 years ago
Amalka Subasinghe
23d2b9d767
added claim adding logic to SP
3 years ago
Amalka Subasinghe
293b5f5a7b
updated pom versions to 5.0.0-SNAPSHOT
3 years ago
Amalka Subasinghe
dfb4235a07
fixed sms-config errors
3 years ago
Amalka Subasinghe
b8935487ef
updated sim-config j2 file
3 years ago
Charitha Goonetilleke
89ae048a5d
Merge branch 'geo-view' into 'master'
...
Add geo view API
See merge request entgra/carbon-device-mgt!775
3 years ago
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
3 years ago
MalshaPiumini
a1567d8a3d
Increase session time for sso and non-sso login.
3 years ago
Pahansith Gunathilake
a136fa4901
Merge branch 'master' into 'master'
...
Fix session expire issue during sso authorization
See merge request entgra/carbon-device-mgt!766
3 years ago
Kaveesha
e111c1dda8
Update DM_DEVICE_INFO table
3 years ago
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
3 years ago
Pahansith Gunathilake
dbe9eecc83
Merge branch 'issue900' into 'master'
...
Support AE with QR code based enrollment
See merge request entgra/carbon-device-mgt!772
3 years ago
Charitha Goonetilleke
3a17cb2329
Consider not now operations as pending
3 years ago
Amalka Subasinghe
83b31f0d02
updated from master and fixed conf copying issue
3 years ago