Commit Graph

9336 Commits

Author SHA1 Message Date
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
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
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
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
charithag
515d6b5797 Allow dynamic control of operations 2021-05-07 17:49:54 +05:30
charithag
2d6f3298bf Add NOTNOW status to activity result 2021-05-07 14:16:27 +05:30
Inosh Perara
adfae44ab5 Merge branch 'serial' into 'master'
Added device filter using serial number.

Closes product-iots#908

See merge request entgra/carbon-device-mgt!759
2021-05-07 01:09:58 +00:00
vigneshan
c2369cde71 Fix session expire issue during sso authorization 2021-05-06 23:18:05 +05:30
MalshaPiumini
6f325862ec Formatting the SQL query. 2021-05-06 14:12:03 +05:30
MalshaPiumini
60b59f455d Solved test case failure. 2021-05-05 14:37:45 +05:30
MalshaPiumini
b2691996ab Added device filter using serial number. 2021-05-05 14:37:45 +05:30
Inosh Perara
a0ed490b0b Merge branch 'Dummy' into 'master'
Device filters in store portal

Closes product-iots#866

See merge request entgra/carbon-device-mgt!746
2021-05-04 04:26:41 +00:00
Inosh Perara
eb69e06fd6 Merge branch 'scope-handler' into 'master'
Improve the permission loading mechanism

See merge request entgra/carbon-device-mgt!765
2021-05-04 04:25:44 +00:00
Inosh Perara
fbe64a026d Merge branch 'app-subscription-fix-2' into 'master'
Add DAO fix for app schedule subscription

See merge request entgra/carbon-device-mgt!764
2021-05-04 03:10:57 +00:00
Pahansith
429e76cfdc Add session scope handler 2021-05-04 08:39:20 +05:30
Pahansith
d9c5421413 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into upstream-master 2021-05-03 11:28:31 +05:30
Pahansith
0060083499 Add DAO fix for app schedule subscription 2021-05-03 11:24:07 +05:30
Inosh Perara
f98cfc14d6 Merge branch 'app-subscription-fix-2' into 'master'
Fix schedule app install DAO issue

See merge request entgra/carbon-device-mgt!762
2021-04-28 13:41:29 +00:00
Pahansith
4dee16dffb Fix schedule install DAO issue 2021-04-28 18:54:31 +05:30
Farheen99
86720b1a45 Add a query to get the applications sort according to latest timestamp order 2021-04-24 12:06:04 +05:30
Inosh Perara
a36d5b39f1 Merge branch 'app-subscription-fix-2' into 'master'
Fix schedule app installation not working issue

See merge request entgra/carbon-device-mgt!758
2021-04-23 15:58:43 +00:00
Charitha Goonetilleke
c6b8bea0b8 Merge branch 'master' into 'master'
Fix token refresh issue

See merge request entgra/carbon-device-mgt!757
2021-04-23 06:17:37 +00:00
Pahansith
365b073e6a Fix app schedule installation issue in single node 2021-04-22 21:32:48 +05:30