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 |
ayyoob
|
4d2c63eff7
|
disabled jwt grant type
|
9 years ago |
ayyoob
|
7e51653b36
|
removed snapshot version from dependencies
|
9 years ago |
Ruwan
|
94ba3ff6c2
|
Merge pull request #112 from rasika90/master
Removing uuf template app feature from iots
|
9 years ago |
Rasika Perera
|
0fc75151f6
|
Removing uuf template app feature
|
9 years ago |
charithag
|
85a00afe85
|
Merge branch 'master' of https://github.com/wso2/product-iot-server
# Conflicts:
# modules/distribution/src/assembly/bin.xml
# modules/features/org.wso2.iot.styles.feature/pom.xml
# modules/features/pom.xml
# modules/p2-profile-gen/pom.xml
|
9 years ago |
ayyoob
|
0b6cd88b78
|
Changed analytics to released version and temporally disabled mobile features until impl is released from base feature.
|
9 years ago |
charithag
|
4cfa5f60ea
|
Disabled IoT device types based features temporally.
|
9 years ago |
charithag
|
17e9dd9127
|
Fix for https://wso2.org/jira/browse/IOTS-99
|
9 years ago |
Ruwan
|
155867b334
|
Merge pull request #109 from ayyoob/master
Added JWT grant type and upgraded the APIM version
|
9 years ago |
ayyoob
|
69740cc2f2
|
updated APIM version
|
9 years ago |
GPrathap
|
65b4dec1d7
|
adding a new gadget: Data Range Picker
|
9 years ago |
GPrathap
|
824503c0d7
|
adding new theme to dashboard portal application
|
9 years ago |
Charitha Goonetilleke
|
9afcfc6ee6
|
Merge pull request #107 from charithag/master
Refactoring
|
9 years ago |
charithag
|
e5c11b9fa5
|
Refactoring
|
9 years ago |
NuwanSameera
|
e0b9524168
|
Remove policy based jaggery apps from samples.
|
9 years ago |
NuwanSameera
|
77b4a51add
|
Resolve conflicts.
|
9 years ago |
NuwanSameera
|
0ab149d392
|
Remove policy based jagerry apps from samples.
|
9 years ago |
charithag
|
16a8e63497
|
Merge branch 'master' of https://github.com/charithag/product-iot-server
# Conflicts:
# modules/samples/doormanager/component/pom.xml
|
9 years ago |
charithag
|
a2c016efcc
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
9 years ago |
charithag
|
dc3540f2ef
|
Merge branch 'master' of https://github.com/charithag/product-iot-server
# Conflicts:
# modules/samples/doormanager/component/pom.xml
|
9 years ago |
GPrathap
|
d9fd45e5ab
|
removed file separator when creating mqtt subscriber topic
|
9 years ago |
NuwanSameera
|
1ac7f55435
|
Add permissions.xml to current sensor device type.
|
9 years ago |
Charitha Goonetilleke
|
6029428336
|
Bump json version
|
9 years ago |
Charitha Goonetilleke
|
f48b35b494
|
Bump json version
|
9 years ago |
Charitha Goonetilleke
|
a7221a04b6
|
Bump json version
|
9 years ago |
Charitha Goonetilleke
|
fbe6ebe9df
|
Fix json library version
|
9 years ago |
Menaka Madushanka
|
130cad34ee
|
Changes suggested in the Code review.
|
9 years ago |
Menaka Madushanka
|
f7cf6fe56e
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
9 years ago |
Menaka Madushanka
|
0333007b1f
|
Changes suggested in the Code review.
|
9 years ago |
NuwanSameera
|
0e01164874
|
Merge branch 'master' of https://github.com/ayyoob/product-iot-server
|
9 years ago |
Menaka Madushanka
|
eb77b572e7
|
Fixes
|
9 years ago |
Menaka Madushanka
|
d7565e7fe7
|
Minor fixes
|
9 years ago |
NuwanSameera
|
aeb3ef20ac
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
9 years ago |
Menaka Madushanka
|
d71b00d925
|
Added constants.
|
9 years ago |
GPrathap
|
24fe930727
|
refactoring code
|
9 years ago |
GPrathap
|
9b38eddd09
|
relocated ui component
|
9 years ago |
GPrathap
|
87c4bbff85
|
removing and adding relevant images
|
9 years ago |
GPrathap
|
39af0a9f57
|
removing and adding required images
|
9 years ago |
GPrathap
|
5deac3cca1
|
adding claims definitions
|
9 years ago |
GPrathap
|
3416a191c0
|
adding agent source code
|
9 years ago |
GPrathap
|
5dd57a157e
|
changing source code according to new API changes
|
9 years ago |
GPrathap
|
e2ce28767e
|
added analytics scripts
|
9 years ago |
GPrathap
|
fa112b28e5
|
removed unnecessary module: agent
|
9 years ago |
GPrathap
|
bd856c0b75
|
refactoring code
|
9 years ago |
GPrathap
|
70fcea507d
|
changed source code according to new API changes
|
9 years ago |
GPrathap
|
4f6ab8f6f6
|
changed group id cdmf.devicetype into org.wso2.cdmf.devicetype
|
9 years ago |
Menaka Madushanka
|
e3f8956d29
|
package refactoring
|
9 years ago |
NuwanSameera
|
ee250d25c5
|
Add permissions.xml to connected-cup device type.
|
9 years ago |