Commit Graph

6729 Commits

Author SHA1 Message Date
Madawa Soysa
f7e3e7d5ca Revert "Merge branch 'security-scan' into 'master'"
This reverts merge request !231
2019-09-05 06:43:51 +00:00
Madawa Soysa
4d891ab0a5 Merge branch 'revert-f99f5c85' into 'master'
Revert "Remove only from scans"

See merge request entgra/carbon-device-mgt!232
2019-09-05 06:38:32 +00:00
Madawa Soysa
f590e92fd0 Revert "Remove only from scans"
This reverts commit f99f5c8552
2019-09-05 06:38:32 +00:00
Madawa Soysa
f99f5c8552 Remove only from scans 2019-09-05 06:04:55 +00:00
Madawa Soysa
70aa11f81a Merge branch 'security-scan' into 'master'
Security scan

See merge request entgra/carbon-device-mgt!231
2019-09-05 06:04:04 +00:00
Madawa Soysa
86f4f7efb9 Security scan 2019-09-05 06:04:03 +00:00
Charitha Goonetilleke
860072842e Merge branch 'master' into 'master'
Introducing a group properties table & ability to add/remove group properties

See merge request entgra/carbon-device-mgt!225
2019-09-03 16:24:36 +00:00
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
Dharmakeerthi Lasantha
b61f763f82 Merge branch 'master' into 'master'
removing font-wso2 and adding font-entgra

See merge request entgra/carbon-device-mgt!221
2019-08-29 08:00:33 +00:00
Ruwan Yatawara
ff7ec02bcb removing font-wso2 and adding font-entgra 2019-08-29 08:00:32 +00:00
Ace
a2d349fa92 fixing license headers 2019-08-29 13:01:00 +05:30
Charitha Goonetilleke
aac7d85c00 Merge branch 'configuration-endpoint' into 'master'
Add device identifier to configuration retrieval response

See merge request entgra/carbon-device-mgt!222
2019-08-29 05:48:14 +00:00
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
Milan Perera
853b896f0e Merge branch 'master' into 'master'
Fix operation DTO initializing issue

See merge request entgra/carbon-device-mgt!220
2019-08-28 11:19:37 +00:00
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
Charitha Goonetilleke
9b021f5601 Merge branch 'configuration-endpoint' into 'master'
Device configuration retrieve endpoint

See merge request entgra/carbon-device-mgt!216
2019-08-27 18:13:40 +00:00
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
Dharmakeerthi Lasantha
9f7addebef Merge branch 'device-type-extension' into 'master'
Re-usability of Device Type Plugin DAO Manager

See merge request entgra/carbon-device-mgt!196
2019-08-19 10:24:53 +00:00
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
Saad Sahibjan
0d203e0cd5 Set device type plugin DAO manager in hashmap 2019-08-19 13:54:39 +05:30
Saad Sahibjan
9d81ee6cb4 Expose device type extension dao plugin via device type deployer 2019-08-19 13:54:39 +05:30
Saad Sahibjan
f1c6ee7068 Add interface for device type plugin dao 2019-08-19 13:54:39 +05:30
Saad Sahibjan
5271fc4163 Add device type extension config 2019-08-19 13:54:39 +05:30
Dharmakeerthi Lasantha
8268c5c508 Merge branch 'move-delete-device-api' into 'master'
Log and set message in response when device not found to delete

See merge request entgra/carbon-device-mgt!205
2019-08-16 12:00:37 +00:00
Saad Sahibjan
dd4a31beb7 Log and set message in response whend device not found to delete 2019-08-16 13:49:49 +05:30
Milan Perera
0261f96cc1 Merge branch 'mssl-fix' into 'master'
Fix apim handler test failures

See merge request entgra/carbon-device-mgt!204
2019-08-15 20:26:01 +00:00
Milan Perera
439ce4f1ec Fix apim handler test failures 2019-08-15 22:23:46 +02:00
Dharmakeerthi Lasantha
3d9813f97e Merge branch 'mssl-fix' into 'master'
Enable basic authentication in cert-mgt webapp

Closes product-iots#128

See merge request entgra/carbon-device-mgt!203
2019-08-15 18:53:11 +00:00
Milan Perera
b7757a65ce Enable basic authentication in cert-mgt webapp 2019-08-15 20:49:14 +02:00
Charitha Goonetilleke
9dfe4abaac Merge branch 'mssl-fix' into 'master'
Remove additional HTTP call from mssl handler

Closes product-iots#128

See merge request entgra/carbon-device-mgt!202
2019-08-15 15:14:23 +00:00
Milan Perera
1cf86ee958 Remove additional HTTP call from mssl handler
This fixes the entgra/product-iots#128
2019-08-15 17:08:45 +02:00
Charitha Goonetilleke
a1330daf24 Merge branch 'master' into 'master'
Fix CN extraction issue

See merge request entgra/carbon-device-mgt!199
2019-08-15 12:56:53 +00:00
Milan Perera
7cddb36fa2 Merge branch 'move-delete-device-api' into 'master'
Move permanently delete device API to device-mgt admin interface

See merge request entgra/carbon-device-mgt!201
2019-08-15 12:31:17 +00:00
Saad Sahibjan
1c825af79d Move delete device permanently to device-mgt admin API 2019-08-15 17:08:21 +05:30
Ruwan Yatawara
f9b9b084ae Merge branch 'master' into 'master'
Fixed issues with searching devices in a group

See merge request entgra/carbon-device-mgt!200
2019-08-15 10:27:39 +00:00