Commit Graph

4579 Commits

Author SHA1 Message Date
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
nipunnadeen
cfdbb919b0 Create an API to get device details with given app installed 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
4c51c0af45 Create an API to get device details with given app installed 2019-10-04 12:04:24 +05:30
Inosh Perara
5cb706f24b Add android enterprise support for IoTS. 2019-10-04 03:08:35 +00:00
Pahansith Gunathilake
db8645e6c5 Add policy type 2019-10-03 17:26:31 +00:00
achala piyarathna
5b50cddea6 Device Location history view feature 2019-10-03 15:51:41 +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
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
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
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
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
milanperera
576ccd2363 Fix issues in fix-172 2019-09-30 15:54:12 +02:00
milanperera
a044bbd385 fix entgra/product-iots#172 2019-09-30 15:47:50 +02:00
Turcy
f28d42d7ce Fix device-type features edit issue 2019-09-30 12:14:35 +05:30
ausamriyaaz
2c27830ecc Fix Null pointer exception 2019-09-27 15:42:01 +05:30
Vinojini Paramasivam
3dcf19dffa Show the applied policies when click view button on policy compliance 2019-09-27 05:51:59 +00:00
charitha
cc2eccae5d Fix configuration retrieval issue with non default admin credentials 2019-09-26 22:38:45 +05:30
Shamalka Navod
59188bcdb3 Fix error logs of DAO implementations 2019-09-26 12:23:10 +00:00
charitha
20dd0b88d2 Merge branch 'application-mgt-new' of https://gitlab.com/charithag/carbon-device-mgt into application-mgt-new 2019-09-26 13:52:17 +05:30
Charitha Goonetilleke
c29dc4dddb Merge branch 'master' into 'application-mgt-new'
Changing status related APIs to honour tenant ID

See merge request charithag/carbon-device-mgt!1
2019-09-26 08:21:46 +00:00
charitha
bfed11080d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-09-26 12:29:49 +05:30
Shamalka Navod
c5793bcf67 API endpoint to get all devices which are enrolled between two dates 2019-09-26 06:23:56 +00:00
Vinojini Paramasivam
8b61bbabea Change search by group name to case insensitive 2019-09-26 04:11:55 +00:00
Ace
545ca7e2a2 Changing status related APIs to honour tenant ID 2019-09-23 23:36:34 +05:30
charitha
20bbb6b91a Re add missing method 2019-09-20 14:02:40 +05:30
charitha
738c4991b9 Merge with upstream/master 2019-09-20 13:55:26 +05:30
Amanda Randombage
a82b4763e2 Fix device management test failures 2019-09-19 21:11:51 +00:00
Amanda Randombage
ff2c038688 Modify permanent delete API to support list of devices 2019-09-19 18:08:56 +00:00
Ace
647099f8a9 Adding debug logs to query-devices API 2019-09-19 10:22:47 +05:30
Ace
8086a54a1a Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-19 08:34:58 +05:30
Ace
7838eaf97b Modifying group devices API to retrieve properties 2019-09-19 07:59:45 +05:30
charitha
2e811aa12b Fix config fetching and device type filtering for tenants 2019-09-18 08:11:20 +05:30
charitha
2c7463a072 Add device transferring across tenants 2019-09-17 20:03:23 +05:30
charitha
30d4a5707a Fix platform config listing 2019-09-17 20:02:50 +05:30
Charitha Goonetilleke
5cf89ec24c Add application installation response via pull notification 2019-09-16 11:49:35 +00:00
charitha
239b1b9bb0 Add application installation response via pull notification 2019-09-16 16:22:24 +05:30
charitha
919eeab2d8 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into application-mgt-new 2019-09-16 13:05:47 +05:30
Charitha Goonetilleke
c3490c129a Fix issue in deploying event streams 2019-09-16 06:48:01 +00:00
lasanthaDLPDS
ed557fc510 Fix merge conflicts 2019-09-15 20:37:13 +05:30
lasanthaDLPDS
cfd0f709ef Add new application type
Add new application type for IoT use cases. Further, it is named as CUSTOM
2019-09-15 18:48:09 +05:30
Ace
fc03c404ad Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-14 13:03:06 +05:30
Dharmakeerthi Lasantha
272077a8d1 Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt!245
2019-09-13 03:00:41 +00:00
lasanthaDLPDS
bf67894924 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-09-13 07:39:50 +05:30
lasanthaDLPDS
cebc18bef6 Fix server starting issue
This issue is occurred as a result of having java8 codes in the source. Hence remove and replace the code.
2019-09-12 22:20:55 +05:30
Ace
def206d17e Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-09-11 16:18:27 +05:30
Ace
82447ef865 Fixing issues with query-devices 2019-09-11 16:18:13 +05:30
Charitha Goonetilleke
11e6e11714 Merge branch 'master' into 'master'
Sort device analytics data

Closes product-iots#140

See merge request entgra/carbon-device-mgt!238
2019-09-11 06:23:21 +00:00
Dharmakeerthi Lasantha
65c462bcd3 Merge branch 'application-mgt-new' into 'application-mgt-new'
Sync with upstream master

See merge request entgra/carbon-device-mgt!240
2019-09-10 15:29:30 +00:00
lasanthaDLPDS
b3860d502e Fix build failure 2019-09-10 20:15:55 +05:30
lasanthaDLPDS
a41b5313a0 Fix merge conflicts 2019-09-10 19:11:37 +05:30
Turcy
e33f28bf8a Sort device analytics data 2019-09-09 23:49:24 +05:30
Charitha Goonetilleke
71488410d4 Merge branch 'master' into 'master'
Rest api to deploy DAS components

See merge request entgra/carbon-device-mgt!226
2019-09-09 15:03:49 +00:00
Yohan Avishke
234c2ee104 Resolve issue with wrong license header 2019-09-09 20:08:33 +05:30
Yohan Avishke
3dff9fef80 Create Endpoints to deploy DAS artifacts as Strings
Four new endpoints were created to deploy DAS artifacts. These apis will accept JSON payloads and convert them to Strings and will use those to deploy artifacts. These endpoints are different from the existing endpoints due to accepting different payloads and using different stubs to deploy.
2019-09-09 19:51:40 +05:30
Turcy
0af18b0255 Make device analytics timestamp human-readable 2019-09-05 16:27:37 +05:30
Yohan Avishke
bed68289b5 Make stream persisting optional
At the moment of creating a stream it will be persisted by default. This was made a optional choice by using a query flag through this commit.
2019-09-02 10:10:22 +05:30
Yohan Avishke
35b03d387c fix: Change in file name
File name of AttributeDataType was changed to AttributeType to resolve some conflicts with import statements.
2019-09-02 00:47:25 +05:30
Yohan Avishke
6def2e1efa Merge branch 'master' of https://gitlab.com/YohanAvishke/carbon-device-mgt 2019-09-02 00:05:32 +05:30
Yohan Avishke
bdf74ac041 API to integrate functionality of DAS
Four endpoints to publish stream, receiver, publisher and siddhi script were added to the device.mgt.api. This commit contains implementation of the above end points, jax-rs beans, custom exceptions and common methods used for the endpoints.
These changes were done in order to decouple the DAS ui from Entgra products.
These endpoints will function by consuming JSON payloads to, generate custom artifacts and deploying them depending on the payload.

BREAKING CHANGE: Four endpoints to publish stream, receiver, publisher and siddhi script were added to the device.mgt.api
2019-09-01 23:57:51 +05:30
Ace
48a0801faf Fixing test failures 2019-08-30 15:24:19 +05:30
Ace
91746c4d04 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-08-30 12:44:42 +05:30
Ace
5f3c069694 introducing a group properties table & ability to add/remove group properties 2019-08-30 12:42:09 +05:30
charitha
5c9c0d3ddf Fix missing operation id in mqtt operation topic 2019-08-30 10:57:37 +05:30
Ruwan Yatawara
ff7ec02bcb removing font-wso2 and adding font-entgra 2019-08-29 08:00:32 +00:00
Saad Sahibjan
91617a6dbb Modify enrollment app install policy to support new app manager 2019-08-29 13:22:18 +05:30
Ace
a2d349fa92 fixing license headers 2019-08-29 13:01:00 +05:30
Pahansith
c940cc03a0 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into configuration-endpoint 2019-08-29 10:52:20 +05:30
Pahansith
3ae5339eff Add device identifier for configuration retrieval endpoint 2019-08-29 10:51:49 +05:30
Ace
749db4e5ac removing references to font-wso2 and updating same to font-entgra 2019-08-28 17:53:53 +05:30
Ace
f6e89d9bef Adding new entgra-theme 2019-08-28 14:07:56 +05:30
Ace
4040d95eaa removing font-wso2-1.3.0 and adding font-entgra-1.4.0 with fresh icons 2019-08-28 13:45:15 +05:30
lasanthaDLPDS
5421c1c38b Fix operation DTO initializing issue 2019-08-28 13:16:54 +05:30
nipunnadeen
05e4da1780 Fix the responsive issues of the device-mgt react app 2019-08-28 10:21:36 +05:30
Pahansith
f01448d396 Change http method to get 2019-08-27 23:16:43 +05:30
Pahansith
a3f44b43b4 Add configuration retrieve endpoint 2019-08-27 12:44:40 +05:30
nipunnadeen
6e71482270 Add the copyright notice to device-mgt react app 2019-08-27 11:38:36 +05:30
nipunnadeen
dbfe6b308b Change the artifactId of the device-mgt pom.xml file 2019-08-26 15:17:40 +05:30
Dharmakeerthi Lasantha
e3a8c85c9b Merge branch 'application-mgt-new' into 'application-mgt-new'
Add navbar to device mgt reat app

See merge request entgra/carbon-device-mgt!213
2019-08-23 12:11:14 +00:00
Jayasanka
d7b290acf6 Add nav bar to device mgt reat app 2019-08-23 14:32:31 +05:30
Dharmakeerthi Lasantha
a4f1bed325 Merge branch 'application-mgt-new' into 'application-mgt-new'
Application mgt new

See merge request entgra/carbon-device-mgt!212
2019-08-22 15:00:18 +00:00
Jayasanka
c417b9708c Add react device-mgt device view page 2019-08-22 20:22:32 +05:30
Jayasanka
cc9e034edd Add react device-mgt device view page 2019-08-22 19:58:22 +05:30
lasanthaDLPDS
76b4953e3a Add device-mgt react ui feature 2019-08-22 18:29:56 +05:30
lasanthaDLPDS
40ec702334 Merge with upstream 2019-08-22 17:58:33 +05:30
lasanthaDLPDS
3a29ab9802 Add device-mgt react app 2019-08-22 17:33:25 +05:30
Saad Sahibjan
4a58aea2d0 Handle exception and log error messages related to DeviceTypeDAOHandler 2019-08-19 13:54:39 +05:30
Saad Sahibjan
0c7843f2fe Modify logic of saving DeviceTypePluginDAOManager to support multi tenancy 2019-08-19 13:54:39 +05:30
Saad Sahibjan
d6d91e4bc2 Remove retrieving device type extension class from deployer file 2019-08-19 13:54:39 +05:30
Saad Sahibjan
a246c16eb6 Register DeviceTypePluginExtensionService 2019-08-19 13:54:39 +05:30
Saad Sahibjan
b9bceadec8 Add the implementation of DeviceTypePluginExtensionService 2019-08-19 13:54:39 +05:30
Saad Sahibjan
c5b4641597 Add the interface of DeviceTypePluginExtensionService 2019-08-19 13:54:39 +05:30
Saad Sahibjan
42b092d43a Add license header for DeviceTypeDAOHandler 2019-08-19 13:54:39 +05:30
Saad Sahibjan
f0103f27c4 Modify error messages and exception handling 2019-08-19 13:54:39 +05:30