Commit Graph

8761 Commits

Author SHA1 Message Date
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
charitha
d5101ff98a Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2020-02-29 10:20:42 +05:30
charitha
82370f0570 Performance improvements 2020-02-28 14:15:29 +05:30
charitha
7b7a6b1ce1 Fix issue in accessing device shared via group 2020-02-28 14:10:27 +05:30
Saad Sahibjan
76d0fff5be Merge branch 'query' into 'master'
Improve the getApplication query to check the tenant

See merge request entgra/carbon-device-mgt!451
2020-02-28 05:55:07 +00:00
Saad Sahibjan
2c2fc00f72 Merge branch 'master' into 'master'
Prevent null pointer for device info

See merge request entgra/carbon-device-mgt!450
2020-02-28 05:54:39 +00:00
nipunnadeen
6cab3293c0 Improve the getApplication query to check the tenant 2020-02-27 20:25:57 +05:30
Saad Sahibjan
7b010f045d Prevent null pointer for device info 2020-02-26 17:05:00 +05:30
Dharmakeerthi Lasantha
f8e2d0a5f9 Merge branch 'fix/react-apps/windows' into 'master'
Add cross environment build support for react applications

Closes product-iots#330

See merge request entgra/carbon-device-mgt!449
2020-02-26 07:48:45 +00:00
Jayasanka Weerasinghe
cd8ed2d677 Add cross environment build support for react applications 2020-02-26 12:26:40 +05:30
Dharmakeerthi Lasantha
2d87cfa96b Merge branch 'feature/dmgt-react/geo/markers' into 'master'
Add markers and modify polyline in location history

Closes product-iots#329

See merge request entgra/carbon-device-mgt!448
2020-02-25 18:45:37 +00:00
Jayasanka Weerasinghe
cf7814c957 Add markers and modify polyline in location history 2020-02-25 21:43:33 +05:30
Jayasanka Weerasinghe
694109b50f Create API and the report to filter devices by encryption status 2020-02-20 14:13:36 +05:30
Dharmakeerthi Lasantha
0f5c62938a Merge branch 'feature/dmgt-react/file-structure' into 'master'
Change the file structure of the DeviceMgt React app

Closes product-iots#326

See merge request entgra/carbon-device-mgt!446
2020-02-19 09:09:56 +00:00
Jayasanka Weerasinghe
a5971e9d11 Change the file structure of the DeviceMgt React app 2020-02-19 13:32:25 +05:30
Dharmakeerthi Lasantha
c1bb3afc1f Merge branch 'devicemgt-reactapp' into 'master'
Add group devices view to devicemgt react app

See merge request entgra/carbon-device-mgt!447
2020-02-18 12:12:43 +00:00
Shamalka Navod
b90b98b7cb Add group devices view to devicemgt react app 2020-02-18 12:12:43 +00:00
Dharmakeerthi Lasantha
38c0e0b544 Merge branch 'reporting' into 'master'
Reporting

See merge request entgra/carbon-device-mgt!445
2020-02-18 04:42:15 +00:00
Inosh Perara
f5aeaf3c3e Update EventPublishingException.java 2020-02-18 04:21:59 +00:00
inoshperera
20a9a98eb1 add reporting config 2020-02-18 09:46:51 +05:30
Dharmakeerthi Lasantha
a9c3347dbc Merge branch 'application-mgt-new' into 'master'
Fix build failure

See merge request entgra/carbon-device-mgt!444
2020-02-14 20:41:44 +00:00