Commit Graph

8981 Commits

Author SHA1 Message Date
Jayasanka Weerasinghe
aa6bb02127 Move device location history algorithm to the backend 2020-03-18 14:10:09 +05:30
Dharmakeerthi Lasantha
69bbd8d512 Merge branch 'master' into 'master'
Add device-mgt react app notification feature

See merge request entgra/carbon-device-mgt!469
2020-03-18 06:11:20 +00:00
Shamalka Navod
070c8cb3ef Add device-mgt react app notification feature 2020-03-18 06:11:19 +00:00
Dharmakeerthi Lasantha
23b68c0b1e Merge branch 'master' into 'master'
Add UI components to Assign policy Type, Assign Groups and Publish Policy view

See merge request entgra/carbon-device-mgt!460
2020-03-18 06:10:21 +00:00
Kaveesha Mihirangi
c984b88c75 Add UI components to Assign policy Type, Assign Groups and Publish Policy view 2020-03-18 06:10:21 +00:00
Dharmakeerthi Lasantha
d8d0530943 Merge branch 'master' into 'master'
Remove duplicates in getApplications API

Closes product-iots#342

See merge request entgra/carbon-device-mgt!467
2020-03-17 09:33:40 +00:00
Shamalka Navod
739ee8281f Remove duplicates in getApplications API 2020-03-17 09:33:40 +00:00
Dharmakeerthi Lasantha
65189c5b04 Merge branch 'delete' into 'master'
Fix permanent delete for multiple enrollments

Closes product-iots#341

See merge request entgra/carbon-device-mgt!466
2020-03-17 07:13:49 +00:00
Amanda
2c04ed347b Delete records from DM_APPLICATION 2020-03-17 11:53:34 +05:30
Dharmakeerthi Lasantha
5d8881ad89 Merge branch 'master' into 'master'
Fix App NOT installed report API query

See merge request entgra/carbon-device-mgt!464
2020-03-16 17:24:22 +00:00
shamalka
45939832e2 Fix App NOT installed report API query 2020-03-16 20:17:07 +05:30
Dharmakeerthi Lasantha
84906b8a09 Merge branch 'report-mgt' into 'master'
Add OSVersion column to DevicesTable component

See merge request entgra/carbon-device-mgt!459
2020-03-16 14:01:38 +00:00
Amanda
efd7b34e60 Add OSVersion column to DevicesTable component 2020-03-14 11:23:30 +05:30
Dharmakeerthi Lasantha
1201ae0e1e Merge branch 'delete' into 'master'
Fix permanent device deletion issue

Closes product-iots#337

See merge request entgra/carbon-device-mgt!461
2020-03-13 05:03:10 +00:00
Amanda
7b8111e19c Fix permanent device deletion issue
- remove the 'removeDeviceApplicationMapping' method
- remove the 'removeEnrollmentDeviceApplicationMapping' method
2020-03-13 09:30:50 +05:30
inoshperera
a77812b769 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into reporting 2020-03-12 13:58:28 +05:30
charitha
f7b6381078 Merge remote-tracking branch 'entgra/master' into entgra-master 2020-03-10 23:02:20 +05:30
charitha
b352354020 Fix issue in initial location persistence from fresh device 2020-03-10 23:02:06 +05:30
inoshperera
3c81f35838 Add get tenant API 2020-03-10 22:06:08 +05:30
inoshperera
5c7a17c3f5 fix merge conflicts 2020-03-10 14:53:49 +05:30
Dharmakeerthi Lasantha
257e8d961f Merge branch 'report-managment' into 'master'
Fix duplicate result issue by adding missing conditions

See merge request entgra/carbon-device-mgt!458
2020-03-10 08:41:34 +00:00
Yohan Avishke
d5911b900d Fix duplicate result issue by adding missing conditions 2020-03-10 12:22:38 +05:30
Dharmakeerthi Lasantha
131e8dfd1c Merge branch 'reporting' into 'reporting'
Add app scree usage reporting related changes

See merge request entgra/carbon-device-mgt!454
2020-03-06 17:38:59 +00:00
Dharmakeerthi Lasantha
f38c1d4ab3 Merge branch 'master' into 'master'
Create HTTP client based on hostname verification property

Closes product-iots#334

See merge request entgra/carbon-device-mgt!455
2020-03-06 17:36:00 +00:00
Dharmakeerthi Lasantha
aa895cdf9d Merge branch 'scope-fix' into 'master'
Add scopes.

See merge request entgra/carbon-device-mgt!457
2020-03-06 08:31:01 +00:00
shamalka
8a30914f90 Add scopes 2020-03-06 13:12:20 +05:30
Inosh Perara
67c09c9558 Merge branch 'reporting' into 'reporting'
Proxied API calls for sub tenant using super tenant details

See merge request entgra/carbon-device-mgt!456
2020-03-06 04:54:10 +00:00
inoshperera
8df21f8af1 minor refactoring for getTenantId 2020-03-05 20:59:00 +05:30
inoshperera
d7355cef55 Proxied API calls for sub tenant using super tenant details 2020-03-05 20:56:19 +05:30
Saad Sahibjan
5d83c83321 Create HTTP client based on hostname verification property 2020-03-05 18:26:49 +05:30
Dharmakeerthi Lasantha
aad275978f Merge branch 'reports' into 'master'
UI to filter devices from their main OS version

See merge request entgra/carbon-device-mgt!440
2020-03-05 11:27:03 +00:00
Amanda Randombage
e3ef99c258 UI to filter devices from their main OS version 2020-03-05 11:27:03 +00:00
Dharmakeerthi Lasantha
e2d56bb352 Merge branch 'report-managment' into 'master'
Change APi to filter devices from their os version

See merge request entgra/carbon-device-mgt!439
2020-03-04 10:13:02 +00:00
Yohan Avishke
2fab3029ff Add equation explaining text to the comments and fix fomratting issues
Text will explain equation step by step by using.
Added missing comments, formatted code lines, formatted license
and added more comments.
2020-03-04 14:35:34 +05:30
Saad Sahibjan
8b5e336986 Use the method to retrieve the reporting host 2020-03-04 14:10:06 +05:30
Saad Sahibjan
7599d97e68 Call reporting app usage endpoint 2020-03-04 13:33:01 +05:30
Saad Sahibjan
2e66e78d7d Add a method to retrieve the reporting host 2020-03-04 13:31:39 +05:30
Saad Sahibjan
a2fad630c7 Add hourly and daily usage to application bean 2020-03-04 13:31:39 +05:30
Inosh Perara
ed1fae5c08 Merge branch 'reporting' into 'reporting'
Add group and roles

See merge request entgra/carbon-device-mgt!453
2020-03-04 07:59:21 +00:00
Yohan Avishke
e8a260dbc4 Change API to filter devices using a given OS version
When syncing devices a value will be generated for each device version.
At the API call same method is used to generate a value for the passed
OS version then thedevices are filtered using those 2 values.

This will still create a similar value but now will use
mathematical operations(pow operations) to generate
2020-03-04 07:00:23 +05:30
inoshperera
05fa975887 mend 2020-03-03 21:44:14 +05:30
inoshperera
83bc51b9df resolve conflics 2020-03-03 21:42:19 +05:30
inoshperera
cecdda4dbf Add group and roles 2020-03-03 21:18:09 +05:30
charitha
2340147a40 Merge remote-tracking branch 'entgra/master' into entgra-master 2020-03-03 09:20:22 +05:30
charitha
cb7323fc02 Add Health Check API 2020-03-03 09:20:07 +05:30
Dharmakeerthi Lasantha
c06c64e290 Merge branch 'feature/dmgt-react/report/encryption' into 'master'
Create API and a report to filter devices by encryption status

Closes product-iots#321

See merge request entgra/carbon-device-mgt!437
2020-03-03 02:57:42 +00:00
charitha
50a7721926 Fix issue in initial device info persistence 2020-03-02 12:04:33 +05:30
charitha
52b45abb16 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2020-03-02 10:34:52 +05:30
Inosh Perara
2a64a1a5ff Merge branch 'master' into 'master'
Performance Improvements

See merge request entgra/carbon-device-mgt!452
2020-03-02 05:02:58 +00:00
Charitha Goonetilleke
100c58f91f Performance Improvements 2020-03-02 05:02:58 +00:00