13 Commits (cf56008672e41049697eb9bcfdb5920c918149c4)

Author	SHA1	Message	Date
NuwanSameera	ab7ee2dbb8	Merge remote-tracking branch 'origin/master' ... Conflicts: modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/transport/ConnectedCupMQTTConnector.java modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/ConnectedCupServiceUtils.java modules/samples/connectedcup/component/controller/src/main/java/org/coffeeking/controller/service/ConnectedCupControllerService.java modules/samples/connectedcup/component/manager/src/main/java/org/coffeeking/manager/service/ConnectedCupManagerService.java modules/samples/connectedcup/component/manager/src/main/webapp/WEB-INF/cxf-servlet.xml modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java modules/samples/currentsensor/component/controller/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorControllerService.java modules/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorManagerService.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDeviceDAOImpl.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java modules/samples/firealarm/component/controller/src/main/java/org.homeautomation/firealarm/controller/api/ControllerService.java	9 years ago
NuwanSameera	c7c2222e4b	Add Uninstall feature to sample device types.	9 years ago
NuwanSameera	ee250d25c5	Add permissions.xml to connected-cup device type.	9 years ago
charithag	9e9627f37f	upstream merge	9 years ago
charithag	81117d00c4	Change water dispensor category	9 years ago
NuwanSameera	cc5cf0e09e	Current sensor display name changed to Samrt Meeter	9 years ago
NuwanSameera	aa6d02f25c	Merge remote-tracking branch 'upstream/master'	9 years ago
NuwanSameera	335632769f	Current Sensor controller changes	9 years ago
charithag	fc702b96b9	Bump carbon device mgt plugins version	9 years ago
NuwanSameera	8ca2614a08	Change Current Sensor display name to Water Dispensor	9 years ago
NuwanSameera	e64bed8b50	Add flow sensor to currentsensor device type and modify device view page	9 years ago
charithag	463fb50b8f	Updated current sensor component structure	9 years ago
NuwanSameera	aff032c66d	Add current sensor device type sample	9 years ago