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 |
|
Charitha Goonetilleke
|
f3384203f4
|
Merge branch 'maven-warning-fixes' into 'master'
Fix maven warnings while building the product
See merge request entgra/carbon-device-mgt!463
|
2020-03-23 07:00:21 +00:00 |
|
Yohan Avishke
|
526c15c360
|
Add checkstyles dependancy with it's version
|
2020-03-23 10:06:35 +05:30 |
|
Saad Sahibjan
|
6a97b38232
|
Merge branch 'fix-cdm-config-issue' into 'master'
Fix issue with package names
See merge request entgra/carbon-device-mgt!475
|
2020-03-21 06:15:10 +00:00 |
|
Yohan Avishke
|
d678059da3
|
Fix issue with package names
|
2020-03-20 23:00:22 +05:30 |
|
Charitha Goonetilleke
|
da5c7e307f
|
Merge branch 'geo-backend' into 'master'
Move device location history grouping logic to the backend
Closes product-iots#343
See merge request entgra/carbon-device-mgt!468
|
2020-03-20 15:37:08 +00:00 |
|
Dharmakeerthi Lasantha
|
7b26a8c943
|
Merge branch 'fix/dmgt-react/notifications' into 'master'
Remove notification sidebar from the Devicemgt react app
Closes product-iots#345
See merge request entgra/carbon-device-mgt!474
|
2020-03-20 15:23:56 +00:00 |
|
Saad Sahibjan
|
2613449ec3
|
Merge branch 'fix-cdm-config-issue' into 'master'
Update package names of PushNotification providers
See merge request entgra/carbon-device-mgt!473
|
2020-03-20 15:22:27 +00:00 |
|
Jayasanka Weerasinghe
|
cadb55f256
|
Remove notification sidebar from the Devicemgt react app
|
2020-03-20 17:37:17 +05:30 |
|
Yohan Avishke
|
8809d63ebd
|
Update package names of PushNotification providers
|
2020-03-20 16:28:14 +05:30 |
|
Dharmakeerthi Lasantha
|
2a20c06c46
|
Merge branch 'master' into 'master'
Payload improvements in add new policy feature in React App
See merge request entgra/carbon-device-mgt!472
|
2020-03-20 06:25:30 +00:00 |
|
Kaveesha Mihirangi
|
07180f091e
|
Payload improvements in add new policy feature in React App
|
2020-03-20 06:25:30 +00:00 |
|
Dharmakeerthi Lasantha
|
1d81648bce
|
Merge branch 'master' into 'master'
Change Restriction Policy UI by adding them to new Element
See merge request entgra/carbon-device-mgt!471
|
2020-03-19 18:03:45 +00:00 |
|
Kaveesha
|
2bf9977a99
|
Add new method to create payload
|
2020-03-19 22:42:35 +05:30 |
|
Kaveesha
|
ed67090e38
|
Generate Basic data in payload and Add Restriction policies to forms
|
2020-03-19 14:33:18 +05:30 |
|
Inosh Perara
|
453b6b8596
|
Merge branch 'reporting' into 'reporting'
Reporting
See merge request entgra/carbon-device-mgt!470
|
2020-03-18 09:17:26 +00:00 |
|
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 |
|