Commit Graph

1580 Commits

Author SHA1 Message Date
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
achala piyarathna
33cac65dd0 Fix build failure 2019-10-04 10:51:21 +00:00
lasanthaDLPDS
f6098a75af Sync with upstream master 2019-10-04 15:39:02 +05:30
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
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
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
ausamriyaaz
2c27830ecc Fix Null pointer exception 2019-09-27 15:42:01 +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
738c4991b9 Merge with upstream/master 2019-09-20 13:55:26 +05:30
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 Goonetilleke
5cf89ec24c Add application installation response via pull notification 2019-09-16 11:49:35 +00:00
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
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
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
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
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
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
lasanthaDLPDS
40ec702334 Merge with upstream 2019-08-22 17:58:33 +05:30
Saad Sahibjan
dd4a31beb7 Log and set message in response whend device not found to delete 2019-08-16 13:49:49 +05:30
Saad Sahibjan
1c825af79d Move delete device permanently to device-mgt admin API 2019-08-15 17:08:21 +05:30
charitha
bb82eb7236 Fix issue in IoT device type loading 2019-08-13 00:08:58 +05:30
lasanthaDLPDS
4e23dbf5af Merge with upstream master 2019-08-08 16:35:52 +05:30
lasanthaDLPDS
9d9f420c83 Fix formatting issues 2019-08-05 18:39:22 +05:30
lasanthaDLPDS
f24cc4342f Merge with master branch 2019-07-17 17:46:33 +05:30
Entgra Builder
3c4ef275f1 [maven-release-plugin] prepare for next development iteration 2019-07-05 09:25:27 +00:00