Commit Graph

8646 Commits

Author SHA1 Message Date
Jayasanka Weerasinghe
aaf6f647ec Add permission based access control to APPM store 2020-04-08 09:57:24 +05:30
Charitha Goonetilleke
0725ecc0d4 Merge branch 'ios-issue-fix' into 'master'
Fix NPE when agent based operations are performed for IOS

See merge request entgra/carbon-device-mgt!495
2020-04-05 16:12:07 +00:00
Yohan Avishke
2665243aa3 Change methods to get device info if necessary
This change was done in order to fix a issue while reading
IOS operations which uses agent(eg: location).
Now it's possible to get devices with there properties
2020-04-05 16:12:07 +00:00
Dharmakeerthi Lasantha
ff2691f5bb Merge branch 'master' into 'master'
Add UI for System Update COSU) and Global Proxy policies

See merge request entgra/carbon-device-mgt!494
2020-04-01 16:50:28 +00:00
Kaveesha Mihirangi
7a90825ea0 Add UI for System Update COSU) and Global Proxy policies 2020-04-01 16:50:27 +00:00
Dharmakeerthi Lasantha
89469e8f61 Merge branch 'reporting2' into 'master'
Refactor event publishing configs

See merge request entgra/carbon-device-mgt!492
2020-04-01 14:14:05 +00:00
Saad Sahibjan
e5a44db713 Merge branch 'master' into 'master'
Add an open endpoint to get UI config

See merge request entgra/carbon-device-mgt!493
2020-04-01 05:09:04 +00:00
inoshperera
90e90b46d6 Refactor event publishing configs 2020-04-01 08:37:30 +05:30
charitha
22d542ed96 Fix SQL error in Application Management 2020-04-01 00:35:29 +05:30
tcdlpds@gmail.com
3d0bbf0b1c Add an open endpoint to get UI config
This API endpoint will be used to get app tags, scopes etc. These data will be used in proxy level when it creates access token.
2020-03-31 21:02:29 +05:30
charitha
91e39d0b04 Fix config in clustered setup 2020-03-31 19:39:20 +05:30
charitha
f4bda90e19 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2020-03-31 16:07:03 +05:30
Dharmakeerthi Lasantha
6a2a2faffd Merge branch 'master' into 'master'
Add UIs for Restriction and Passcode Policies

See merge request entgra/carbon-device-mgt!491
2020-03-30 18:33:51 +00:00
Kaveesha Mihirangi
514d38d0b5 Add UIs for Restriction and Passcode Policies 2020-03-30 18:33:51 +00:00
Charitha Goonetilleke
c7025f07cf Merge branch 'performance-improvement' into 'master'
Performance improvements

See merge request entgra/carbon-device-mgt!487
2020-03-30 09:56:10 +00:00
Charitha Goonetilleke
5dc235d8d6 Performance improvements 2020-03-30 09:56:10 +00:00
Dharmakeerthi Lasantha
04431b57c7 Merge branch 'master' into 'master'
Fix device type DAO handler being persisted in a wrong way

Closes product-iots#388

See merge request entgra/carbon-device-mgt!490
2020-03-30 08:30:29 +00:00
Saad Sahibjan
460ce4f64a Fix device type DAO handler being persisted in a wrong way 2020-03-30 13:17:47 +05:30
Dharmakeerthi Lasantha
e09354ada9 Merge branch 'device-table-change' into 'master'
Fix DevicesTable import issue in GroupDevicesModal component

See merge request entgra/carbon-device-mgt!489
2020-03-29 19:35:40 +00:00
Shamalka Navod
9843b2e5b9 Fix DevicesTable import issue in GroupDevicesModal component 2020-03-29 19:35:38 +00:00
Dharmakeerthi Lasantha
7d660e3105 Merge branch 'master' into 'master'
Remove reporting components

See merge request entgra/carbon-device-mgt!488
2020-03-29 17:44:03 +00:00
tcdlpds@gmail.com
1432923991 Remove reporting components 2020-03-29 23:08:59 +05:30
charitha
07ce838251 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2020-03-29 21:44:51 +05:30
charitha
4454ef26de Performance improvements 2020-03-29 21:44:15 +05:30
Inosh Perara
670174e25d Merge branch 'reporting2' into 'master'
Reporting conflict fixes

See merge request entgra/carbon-device-mgt!486
2020-03-29 08:37:30 +00:00
inoshperera
91fbb28de6 Fix merge conflics 2020-03-29 13:24:05 +05:30
inoshperera
b843d8eefe test fixes 2020-03-29 13:16:33 +05:30
inoshperera
9fab25d8d4 Test case fix for proxy tenant id 2020-03-29 13:16:33 +05:30
inoshperera
2ab0efbcdd validate oauth token and permission 2020-03-29 13:16:33 +05:30
inoshperera
1bb18f30c9 Add get tenant API 2020-03-29 13:16:33 +05:30
inoshperera
1193910f52 minor refactoring for getTenantId 2020-03-29 13:16:33 +05:30
inoshperera
af12d3fe9a Proxied API calls for sub tenant using super tenant details 2020-03-29 13:16:32 +05:30
Saad Sahibjan
a45d2d7cb0 Use the method to retrieve the reporting host 2020-03-29 13:16:32 +05:30
Saad Sahibjan
9da0bc8de0 Call reporting app usage endpoint 2020-03-29 13:16:32 +05:30
Saad Sahibjan
3a7ea53c3a Add a method to retrieve the reporting host 2020-03-29 13:16:32 +05:30
Saad Sahibjan
30da5afdab Add hourly and daily usage to application bean 2020-03-29 13:16:32 +05:30
Inosh Perara
9ddb6b4f9e Merge branch 'reporting2' into 'master'
Reporting conflict fixes

See merge request entgra/carbon-device-mgt!485
2020-03-29 07:31:51 +00:00
inoshperera
60b4a2493c merge conflics resoved 2020-03-29 12:59:28 +05:30
inoshperera
199b61ab94 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into reporting2 2020-03-29 12:24:51 +05:30
Inosh Perara
397e00d2f7 Merge branch 'reporting2' into 'reporting'
Reporting2

See merge request entgra/carbon-device-mgt!484
2020-03-29 06:51:27 +00:00
inoshperera
2e265fcb3d test fixes 2020-03-29 12:19:23 +05:30
inoshperera
b7de3225a1 Test case fix for proxy tenant id 2020-03-29 12:19:23 +05:30
inoshperera
3f8a6a1957 validate oauth token and permission 2020-03-29 12:19:23 +05:30
Dharmakeerthi Lasantha
66722ed71e Merge branch 'master' into 'master'
Implement  create, apply, edit, view policy features to device-mgt React App

See merge request entgra/carbon-device-mgt!483
2020-03-27 16:56:49 +00:00
Kaveesha Mihirangi
db35d5e6a7 Implement create, apply, edit, view policy features to device-mgt React App 2020-03-27 16:56:49 +00:00
charitha
f1aa82c2b8 Fix platform configuration display for custom units 2020-03-25 19:24:43 +05:30
Dharmakeerthi Lasantha
03345edca3 Merge branch 'user-claims' into 'master'
Add external device-user claim APIs and UI

Closes product-iots#346

See merge request entgra/carbon-device-mgt!478
2020-03-24 17:00:14 +00:00
Shamalka Navod
a03153c2dd Add external device-user claim APIs and UI 2020-03-24 17:00:14 +00:00
Dharmakeerthi Lasantha
4e1cbdd72e Merge branch 'appm-store/directory-structure' into 'master'
Change the file structure of the APIM Store

Closes product-iots#347

See merge request entgra/carbon-device-mgt!480
2020-03-23 13:52:03 +00:00
Jayasanka Weerasinghe
7976ee4e51 Change the file structure of the APIM Store 2020-03-23 18:01:35 +05:30