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
|
2016-04-18 11:49:18 +05:30 |
|
NuwanSameera
|
c7c2222e4b
|
Add Uninstall feature to sample device types.
|
2016-04-18 11:47:47 +05:30 |
|
charithag
|
17e9dd9127
|
Fix for https://wso2.org/jira/browse/IOTS-99
|
2016-03-25 15:29:40 +05:30 |
|
NuwanSameera
|
e0b9524168
|
Remove policy based jaggery apps from samples.
|
2016-03-17 15:00:43 +05:30 |
|
NuwanSameera
|
77b4a51add
|
Resolve conflicts.
|
2016-03-17 14:57:25 +05:30 |
|
NuwanSameera
|
0ab149d392
|
Remove policy based jagerry apps from samples.
|
2016-03-17 14:44:20 +05:30 |
|
NuwanSameera
|
ee250d25c5
|
Add permissions.xml to connected-cup device type.
|
2016-03-11 19:16:09 +05:30 |
|
NuwanSameera
|
cc5cf0e09e
|
Current sensor display name changed to Samrt Meeter
|
2016-02-15 13:17:21 +05:30 |
|
charithag
|
fc702b96b9
|
Bump carbon device mgt plugins version
|
2016-02-11 15:33:10 +05:30 |
|
NuwanSameera
|
8ca2614a08
|
Change Current Sensor display name to Water Dispensor
|
2016-02-08 17:42:40 +05:30 |
|
NuwanSameera
|
e64bed8b50
|
Add flow sensor to currentsensor device type and modify device view page
|
2016-02-08 16:07:32 +05:30 |
|
charithag
|
463fb50b8f
|
Updated current sensor component structure
|
2016-02-02 21:27:23 +05:30 |
|