Commit Graph

8035 Commits

Author SHA1 Message Date
Dharmakeerthi Lasantha
b127c3015e Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt!280
2019-10-04 12:56:05 +00:00
lasanthaDLPDS
8c40a81c4a Sync with upstream master 2019-10-04 18:23:17 +05:30
Dharmakeerthi Lasantha
a4f99c9c77 Merge branch 'conflicts-fix' into 'application-mgt-new'
Create an APIs to get device details and the subscription details with given app installed

See merge request entgra/carbon-device-mgt!277
2019-10-04 10:58:21 +00:00
lasanthaDLPDS
7a5a231974 Merge branch 'application-mgt-new' of gitlab.com:entgra/carbon-device-mgt into conflicts-fix 2019-10-04 16:25:52 +05:30
Dharmakeerthi Lasantha
44adc963cb Fix build failure 2019-10-04 10:51:21 +00:00
achala piyarathna
33cac65dd0 Fix build failure 2019-10-04 10:51:21 +00:00
lasanthaDLPDS
baf382c706 Fix formatting issues 2019-10-04 15:44:19 +05:30
lasanthaDLPDS
f6098a75af Sync with upstream master 2019-10-04 15:39:02 +05:30
lasanthaDLPDS
298c58e8b8 Fix merge conflicts 2019-10-04 13:57:55 +05:30
nipun
4ac94746fa Merge branch 'application-mgt-new' of https://gitlab.com/nipunnadeen/carbon-device-mgt into appm-new 2019-10-04 12:06:13 +05:30
nipun
c095ca40ff Fix the uninstall operation of the uninstall API 2019-10-04 12:04:24 +05:30
nipunnadeen
58c866f33d Improve the subscribed devices and category details APIs 2019-10-04 12:04:24 +05:30
nipunnadeen
9d1171b620 Improve the subscribed category details API 2019-10-04 12:04:24 +05:30
nipunnadeen
29951a1560 Create an API to get subscribed Category details 2019-10-04 12:04:24 +05:30
nipunnadeen
cfdbb919b0 Create an API to get device details with given app installed 2019-10-04 12:04:24 +05:30
nipun
d363194356 Modify the uninstall UI of the APPM store 2019-10-04 12:04:24 +05:30
nipun
e4311d4e3a Modify the subscribed devices and category APIs 2019-10-04 12:04:24 +05:30
nipunnadeen
c08e631c93 Improve the subscribed devices and category details APIs 2019-10-04 12:04:24 +05:30
nipunnadeen
e3b29ee531 Improve the subscribed category details API 2019-10-04 12:04:24 +05:30
nipunnadeen
153b7f1385 Create the uninstall ui of the APPM store 2019-10-04 12:04:24 +05:30
nipunnadeen
5cbe25c0d7 Create an API to get subscribed Category details 2019-10-04 12:04:24 +05:30
nipunnadeen
4c51c0af45 Create an API to get device details with given app installed 2019-10-04 12:04:24 +05:30
lasanthaDLPDS
6b51d1fd06 Improve app subscribing functionality 2019-10-04 08:41:38 +05:30
Dharmakeerthi Lasantha
11610d3635 Add android enterprise support for IoTS. 2019-10-04 03:08:35 +00:00
Inosh Perara
5cb706f24b Add android enterprise support for IoTS. 2019-10-04 03:08:35 +00:00
Dharmakeerthi Lasantha
1c0288d3fb Merge branch 'policy-type-creation' into 'master'
Add policy type

Closes product-iots#145

See merge request entgra/carbon-device-mgt!182
2019-10-03 17:26:31 +00:00
Pahansith Gunathilake
db8645e6c5 Add policy type 2019-10-03 17:26:31 +00:00
Dharmakeerthi Lasantha
4e4b2fb5c8 Merge branch 'newGeo' into 'application-mgt-new'
Device Location history view feature

See merge request entgra/carbon-device-mgt!275
2019-10-03 15:51:41 +00:00
achala piyarathna
5b50cddea6 Device Location history view feature 2019-10-03 15:51:41 +00:00
Dharmakeerthi Lasantha
852518f9af Merge branch 'application-mgt-new' into 'application-mgt-new'
Frontend for report generating feature

See merge request entgra/carbon-device-mgt!269
2019-10-03 13:30:14 +00:00
Shamalka Navod
fdf660014f UI to generate reports
Get devices which are enrolled between two date according to device status and ownership
2019-10-03 13:30:13 +00:00
Dharmakeerthi Lasantha
ca26098da1 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add metadata feature to APPM UI

See merge request entgra/carbon-device-mgt!274
2019-10-03 13:26:04 +00:00
Jayasanka
6786ed0fab Add UI Improvements to APPM UI
The following changes are with this commit
- Add metadata to Add new app & edit app forms in Publisher
- Display metadata in both publisher and store views
- Fix typo in lifecycle component
- Update table when changing the name & categories in apps table in publisher
2019-10-03 17:28:25 +05:30
Saad Sahibjan
d683d0c93f Merge branch 'master' into 'master'
Fix incorrect device view issue for different ownerships.

Closes product-iots#135

See merge request entgra/carbon-device-mgt!273
2019-10-03 10:09:06 +00:00
lasanthaDLPDS
2d58d69d2f Fix incorrect device view issue for different ownerships. 2019-10-03 15:38:07 +05:30
Dharmakeerthi Lasantha
c91e1c43e7 Merge branch 'application-mgt-new' into 'application-mgt-new'
Implement scheduled application install/uninstall feature

See merge request entgra/carbon-device-mgt!250
2019-10-03 09:50:39 +00:00
Madawa Soysa
c9f12d47cb Implement scheduled application install/uninstall task
Fixes entgra/product-iots#160
2019-10-03 09:50:39 +00:00
Dharmakeerthi Lasantha
03e28c3eb9 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add UI Improvements in APPM publisher

See merge request entgra/carbon-device-mgt!270
2019-10-01 09:34:42 +00:00
nipun
2103e0ea48 Modify the uninstall UI of the APPM store 2019-10-01 14:36:11 +05:30
nipun
7323ea0271 Modify the subscribed devices and category APIs 2019-10-01 14:36:11 +05:30
nipunnadeen
61bd91b21f Improve the subscribed devices and category details APIs 2019-10-01 14:36:11 +05:30
nipunnadeen
4cfa0789ac Improve the subscribed category details API 2019-10-01 14:36:11 +05:30
nipunnadeen
9886b9f2fe Create the uninstall ui of the APPM store 2019-10-01 14:36:11 +05:30
nipunnadeen
2732de2148 Create an API to get subscribed Category details 2019-10-01 14:33:22 +05:30
nipunnadeen
8a91702975 Create an API to get device details with given app installed 2019-10-01 14:33:22 +05:30
Shamalka Navod
8ff264a044 Fix error logs of DAO implementations 2019-10-01 13:46:53 +05:30
Dharmakeerthi Lasantha
252b9194cf Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync master branch in to application-mgt-new

See merge request entgra/carbon-device-mgt!268
2019-10-01 04:56:33 +00:00
charitha
4e9628dff4 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-01 08:40:23 +05:30
charitha
2b902e878c Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-10-01 08:33:05 +05:30
Milan Perera
fe23ab711c Merge branch 'master' into 'master'
Master

Closes product-iots#172

See merge request entgra/carbon-device-mgt!267
2019-09-30 14:32:15 +00:00