Commit Graph

9657 Commits

Author SHA1 Message Date
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
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
Amalka Subasinghe
83b31f0d02 updated from master and fixed conf copying issue 2021-05-24 16:40:05 +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
Amalka Subasinghe
af2f8155e5 added webapp authenticator component 2021-05-21 12:32:02 +05:30
charithag
e5fb17aceb Add geo view API 2021-05-19 17:12:50 +05:30
Amalka Subasinghe
0162753d6a Fixed SSO 2021-05-19 11:16:22 +05:30
Amalka Subasinghe
23b25fb540 Templated configs 2021-05-18 14:52:47 +05:30
Amalka Subasinghe
d5c85980e1 move appmgt db creation, application-extension synapse apis, cdm datasource config 2021-05-18 14:52:28 +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
Amalka Subasinghe
a12be72a13 updated to kernel 4.6.2 2021-05-14 10:34:41 +05:30
Inosh Perara
70ac192696 Merge branch 'invoker' into 'master'
Update invoker handler to append tenant-id for reporting backend get api calls

See merge request entgra/carbon-device-mgt!769
2021-05-13 05:52:57 +00:00
Dharmakeerthi Lasantha
3868f3abe8 Merge branch 'master' into 'master'
Update item bean class to get documentation link from xml

See merge request entgra/carbon-device-mgt!768
2021-05-13 03:42:45 +00:00
vigneshan
6cfdf85c1d Update invoker handler to append tenant-id for reporting backend get api calls 2021-05-12 21:53:43 +05:30
Kaveesha
6c947962d6 Update item bean class to get documentation link from xml 2021-05-12 15:00:56 +05:30
Amalka Subasinghe
2915651272 cleaned up features 2021-05-10 13:23:36 +05:30
Amalka Subasinghe
0d8750f0a7 cleaned up components/webapp-authenticator-framework 2021-05-10 13:07:47 +05:30
Amalka Subasinghe
73df5e2fed cleaned up components/ui-request-interceptor 2021-05-10 13:06:30 +05:30
Amalka Subasinghe
95695e850d cleaned up components/transport-mgt 2021-05-10 12:48:50 +05:30
Amalka Subasinghe
1f2b1e84e6 cleaned up components/policy-mgt 2021-05-10 12:46:56 +05:30
Amalka Subasinghe
bf074061f1 cleaned up components/identity-extensions 2021-05-10 12:36:01 +05:30
Amalka Subasinghe
8590268db4 cleaned up components/heartbeat-management/ 2021-05-10 12:33:04 +05:30
Amalka Subasinghe
056987141b cleaned up components/device-mgt 2021-05-10 12:30:38 +05:30
Amalka Subasinghe
584dbd7894 cleaned up components/certificate-mgt 2021-05-10 11:02:18 +05:30
Amalka Subasinghe
7108b15549 cleaned up components/application-mgt 2021-05-10 10:56:16 +05:30