ayyoob
|
568bb7d09f
|
Merge branch 'master' of https://github.com/wso2/product-iots into das-ext
|
9 years ago |
|
ayyoob
|
b336c05625
|
few fixes after testing
|
9 years ago |
Ruwan
|
062f922f32
|
Merge pull request #119 from NuwanSameera/master
Remove monitor operations from controoler api from samples.
|
9 years ago |
NuwanSameera
|
4f28e803af
|
Remove monitor operations from controoler api.
|
9 years ago |
Prabath Abeysekara
|
2fadbc10a6
|
Merge pull request #116 from charithag/master
Add devicemgt_admin jax-rs and removed mdm-admin jax-rs
|
9 years ago |
|
Prabath Abeysekara
|
a6e2b235c9
|
Merge pull request #117 from ayyoob/das-ext
Added DAS extensions features and upgraded analytics versions
|
9 years ago |
|
ayyoob
|
394f57d729
|
Added DAS Extensions features
|
9 years ago |
charithag
|
4d76f89b87
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
9 years ago |
|
charithag
|
863b616b0b
|
Disabling tests temporally until setting the port offset for automation.
|
9 years ago |
|
charithag
|
276eca2c63
|
Enabled UI testing again
|
9 years ago |
|
charithag
|
49466b2953
|
Add devicemgt_admin jax-rs and removed mdm-admin jax-rs
|
9 years ago |
|
Ruwan
|
d8351aaa1e
|
Merge pull request #115 from NuwanSameera/master
Add Uninstall feature to sample device types.
|
9 years ago |
|
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
|
e9f2062362
|
added files related to activate synapse as a gateway
|
9 years ago |
|
ayyoob
|
f2648c2c28
|
few changes after testing with the apim
|
9 years ago |
|
ayyoob
|
a80a493506
|
few changes after testing
|
9 years ago |
|
ayyoob
|
d9361e073e
|
Merge branch 'master' of https://github.com/wso2/product-iots into das-ext
|
9 years ago |
|
ayyoob
|
f91b566425
|
version update and added das extension feature
|
9 years ago |
|
Ruwan
|
f80523f409
|
Merge pull request #114 from charithag/master
Fix build status link and icon with content update
|
9 years ago |
|
charithag
|
7ba03e6cc6
|
Fix build status link and icon with content update
|
9 years ago |
|
Ruwan
|
783465d459
|
Merge pull request #113 from ayyoob/master
removed snapshot version from dependencies
|
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 |
|
Prabath Abeysekara
|
bdb3bb3023
|
Merge pull request #110 from charithag/master
Disabled IoT device types based features temporally.
|
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 |
|
Prabath Abeysekara
|
e679648ffb
|
Merge pull request #111 from ayyoob/merge-latest
Changed analytics to released version and temporally disabled mobile …
|
9 years ago |
|
ayyoob
|
5b81f8a6a3
|
upgraded analytics version to snapshot to resolve spark errors
|
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 |
Charitha Goonetilleke
|
8f60317a4f
|
Add build status
|
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 |
|
Ruwan
|
ed1c9c7ae3
|
Merge pull request #108 from GPrathap/master
upgrade and add new theme to dashboard portal application
|
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 |
|
GPrathap
|
948c059c4e
|
upgrading the dashboard portal application from 1.0.9 to 1.0.14-SNAPSHOT
|
9 years ago |
|
Charitha Goonetilleke
|
9afcfc6ee6
|
Merge pull request #107 from charithag/master
Refactoring
|
9 years ago |
|
charithag
|
e5c11b9fa5
|
Refactoring
|
9 years ago |
|
Ruwan
|
98cbc423b9
|
Merge pull request #106 from NuwanSameera/master-nuwan
Remove policy based jaggery apps from samples.
|
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 |
|
Charitha Goonetilleke
|
f630876d7a
|
Merge pull request #105 from charithag/master
Fix json library version
|
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 |
