Commit Graph

742 Commits

Author SHA1 Message Date
Dharmakeerthi Lasantha
3cc68f761e Merge branch 'master' into 'master'
Fix app manager permissions not being displayed

Closes product-iots#281

See merge request entgra/carbon-device-mgt!393
2019-11-15 08:18:04 +00:00
Ruwan Liyanage
d5976deed8 Fix HTTP Error 500 issue on the role edit page 2019-11-15 08:17:37 +00:00
Saad Sahibjan
7cf86d5b60 Fix app manager permissions not being displayed 2019-11-14 19:05:45 +05:30
charitha
e6ea2175cd Add review suggestions 2019-11-04 12:39:15 +05:30
charitha
efff1e2cfd Fix device group related issues
- Create group - Not working when group properties are not available
- Delete group - SQL error
- Get devices of group - Database connection management issue
2019-11-03 23:51:54 +05:30
lasanthaDLPDS
dbd21719f1 Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into application-mgt-new 2019-10-27 23:15:51 +05:30
charitha
d6845cd40a Add new API endpoints
- Change device status as bulk
- Get total device count
- Add group with different owner
2019-10-26 01:03:44 +05:30
Shamalka Navod
a78d3e17d4 Group create/edit/delete/share functions 2019-10-25 05:53:07 +00:00
Yohan Avishke
4a3a9b587e Change invalid payload exception responses to bad requests 2019-10-23 11:51:34 +05:30
Yohan Avishke
8bebf2c126 Wrap service level error messages from api level error messages 2019-10-23 06:50:59 +05:30
Charitha Goonetilleke
e58ca40323 Merge branch 'application-mgt-new' into 'application-mgt-new'
Adding status column to GROUP table and honuring same in API

See merge request entgra/carbon-device-mgt!341
2019-10-22 14:39:55 +00:00
Ace
548ad336bf Adding status column to GROUP table and honuring same in API 2019-10-18 18:18:40 +05:30
Saad Sahibjan
622e1842de Add corrective actions in policy wrapper to policy object 2019-10-18 15:04:08 +05:30
Saad Sahibjan
bb1a3f6230 Add correctiveAction to policy wrapper bean class 2019-10-18 15:04:08 +05:30
Shamalka Navod
b291c814c4 Fix Device dis-enrollment issue in APPM 2019-10-16 13:27:20 +00:00
Yohan Avishke
8489dec2b1 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/EventStream.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java
2019-10-16 07:24:03 +05:30
Yohan Avishke
51b7f8b206 Modify code to limit garbage collectible objects and create method to deploy adapters without custom mapping
Removed creation of ArrayLists when a service is been called and added null validation to those lists in service layer. Developed code to deploy adapters when custom mapping is false and updated exception handling.
2019-10-16 07:12:31 +05:30
lasanthaDLPDS
0b238b9c45 Merge with upstream master 2019-10-15 12:51:54 +05:30
Yohan Avishke
4557c5fc5c Update the Analytics Artifacts Management API 2019-10-14 09:35:32 +00:00
Yohan Avishke
d885707046 Refactor code in a reusable way and change response messages
Removed repeated classes and implemented code to already existing classes and divided code into sub methods to limit repetitive code and increase readability. And the response messages were change in order to give users a better understating of the responses they get when calling the api endpoints.
2019-10-13 12:37:55 +05:30
Yohan Avishke
fe4e857639 Change exception codes of device stream events 2019-10-13 12:37:55 +05:30
Yohan Avishke
e643db08d1 Change event attribute mapping logic and error handling
Event attribute mapping logic was moved to service layer from the api layer and a created a meaningful error message.
2019-10-13 12:37:55 +05:30
Yohan Avishke
da2d95e7ac Change event attribute mapping logic and error handling
Event attribute mapping logic was moved to service layer from the api layer and a created a meaningful error message.
2019-10-13 12:37:55 +05:30
Yohan Avishke
f660bf9edd Add ApiParams to all the parameters 2019-10-13 12:37:55 +05:30
Yohan Avishke
e5963c79fd Override toString 2019-10-13 12:37:55 +05:30
Amanda Randombage
824403b97e Change permanent delete HTTP method 2019-10-09 01:54:08 +00:00
Shamalka Navod
bc406b6c92 Add UI feature to delete set of devices 2019-10-08 18:47:08 +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
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