Commit Graph

6687 Commits

Author SHA1 Message Date
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
Ace
b260e5c086 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-08-15 15:15:22 +05:30
Ace
18218a351c Fixing issues with searching devices with groupID as a param 2019-08-15 15:12:42 +05:30
charitha
0d0daa5b8b Fix CN extraction issue 2019-08-15 14:09:37 +05:30
charitha
bb82eb7236 Fix issue in IoT device type loading 2019-08-13 00:08:58 +05:30
charitha
f434fafbe1 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2019-08-12 13:12:27 +05:30
Saad Sahibjan
b48fb6a1b6 Merge branch 'master' into 'master'
Fix formatting issues

See merge request entgra/carbon-device-mgt!195
2019-08-05 13:15:54 +00:00
lasanthaDLPDS
9d9f420c83 Fix formatting issues 2019-08-05 18:39:22 +05:30
charitha
3c58a380ad Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2019-07-24 10:56:21 +05:30
Dharmakeerthi Lasantha
e42950dd76 Merge branch 'master' into 'master'
Add missing commit in master - Fix NPE for policy

See merge request entgra/carbon-device-mgt!177
2019-07-17 02:26:17 +00:00
inoshperera
62f2a214f3 fix NPE for policy 2019-07-15 14:21:35 +05:30
Entgra Builder
3c4ef275f1 [maven-release-plugin] prepare for next development iteration 2019-07-05 09:25:27 +00:00
Entgra Builder
03703b83eb [maven-release-plugin] prepare release v3.2.8 2019-07-05 09:25:15 +00:00
Ruwan Yatawara
59e14c6c1f Merge branch 'master' into 'master'
Bumping product versions

See merge request entgra/carbon-device-mgt!167
2019-07-05 09:02:02 +00:00
Entgra Builder
fc7cf05e90 [maven-release-plugin] prepare for next development iteration 2019-07-04 07:27:48 +00:00
Entgra Builder
93c53c8748 [maven-release-plugin] prepare release v3.2.7 2019-07-04 07:27:42 +00:00
Ace
1ad6519600 changing references to older release in html pages 2019-07-04 11:06:21 +05:30
Ace
2ddcf41b24 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-07-04 09:38:50 +05:30
Ruwan Yatawara
cd4373b352 Merge branch 'master' into 'master'
Adding new API to search devices based on device properties

See merge request entgra/carbon-device-mgt!162
2019-07-04 04:06:52 +00:00
Ace
3369438f2d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-07-04 09:21:31 +05:30
Ace
ca07db3fca Adding code to retrieve properties instead of the entire device 2019-06-28 11:25:01 +05:30
Ace
42b9753944 fixing bug with unitiated list 2019-06-28 10:13:51 +05:30
Ace
192984e3c0 Adding new API to search devices based on device properties 2019-06-27 17:03:00 +05:30
Ruwan Yatawara
bdb40c94d1 Merge branch 'master' into 'master'
updating references to 3.5.0 release to 3.6.0

See merge request entgra/carbon-device-mgt!160
2019-06-27 11:31:38 +00:00
Ace
33ffa23efc updating references to 3.5.0 release to 3.6.0 2019-06-26 13:24:00 +05:30
charitha
fdd0b3c3e2 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2019-06-26 01:32:19 +05:30
Charitha Goonetilleke
b2e0c1fd97 Merge branch 'delete-device' into 'master'
Plugin level support for deleting device permanently

See merge request entgra/carbon-device-mgt!148
2019-06-25 19:15:24 +00:00
Saad Sahibjan
58a31d0031 Plugin level support for deleting device permanently 2019-06-25 19:15:24 +00:00
Ruwan Yatawara
fbe4b01fc4 Merge branch 'fix-iots-109' into 'master'
Fix https://gitlab.com/entgra/product-iots/issues/109

Closes product-iots#109

See merge request entgra/carbon-device-mgt!133
2019-06-17 09:14:10 +00:00
charitha
b30ea9a3f3 Fix https://gitlab.com/entgra/product-iots/issues/109 2019-06-17 10:00:52 +05:30
charitha
59f76f4605 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2019-06-17 09:37:04 +05:30
charitha
3b905f450a Fix https://gitlab.com/entgra/product-iots/issues/109 2019-06-17 09:36:54 +05:30
Inosh Perara
9e336e9c5a Merge branch 'master' into 'master'
Increase length of VALUE_FIELD column in DM_DEVICE_INFO table

Closes product-iots#106

See merge request entgra/carbon-device-mgt!131
2019-06-13 09:43:32 +00:00
Saad Sahibjan
e26b50742b Increase length of VALUE_FIELD column in DM_DEVICE_INFO table 2019-06-13 13:28:06 +05:30
Inosh Perara
391b9677a7 Merge branch 'mac-os' into 'master'
MacOS

See merge request entgra/carbon-device-mgt!126
2019-06-09 16:41:20 +00:00
Dharmakeerthi Lasantha
c20d0ae542 Merge branch 'master' into 'master'
Add user created date and modified date

See merge request entgra/carbon-device-mgt!124
2019-06-09 05:09:12 +00:00
Milan Perera
650f02bf03 Add user created date and modified date 2019-06-09 10:03:50 +05:30
Entgra Builder
5a6789e336 [maven-release-plugin] prepare for next development iteration 2019-06-03 15:43:13 +00:00
Entgra Builder
c71b1f9314 [maven-release-plugin] prepare release v3.2.6 2019-06-03 15:43:05 +00:00
Ruwan Yatawara
c15fbe9192 Merge branch 'delete-device' into 'master'
Permanently Delete Device

Closes product-iots#98

See merge request entgra/carbon-device-mgt!118
2019-06-03 14:38:50 +00:00
Saad Sahibjan
1f001b09f1 Fix tests related to deleteDevice API 2019-06-03 15:18:03 +05:30
Saad Sahibjan
52e971de76 Add delete device dao related implementation 2019-06-03 15:18:03 +05:30
Saad Sahibjan
48ae5c58e9 Add deleteDevice service and impl 2019-06-03 15:18:03 +05:30