Rasika Perera
|
70b1f9374c
|
Fixing incorrect device object returned from JS to Hbs templates
|
2016-09-27 20:45:13 +05:30 |
|
ayyoob
|
70483aacde
|
merged with upstream
|
2016-07-28 17:03:08 +05:30 |
|
ayyoob
|
dca55c7385
|
fixed formatting issues and removed storing error message
|
2016-07-28 15:40:55 +05:30 |
|
ayyoob
|
1033dfd40e
|
added missng log trace
|
2016-07-28 15:22:07 +05:30 |
|
ayyoob
|
5991eeec58
|
added missing log
|
2016-07-28 14:32:30 +05:30 |
|
ayyoob
|
9c82589af2
|
fixed formatting issues
|
2016-07-28 14:28:28 +05:30 |
|
Milan Perera
|
aeef79b47e
|
Merge pull request #180 from ayyoob/das-ext
few changes in real time analytics
|
2016-07-28 14:13:50 +05:30 |
|
ayyoob
|
971fd80b83
|
few changes in real time analytics
|
2016-07-27 14:45:55 +05:30 |
|
charitha
|
0a61e29641
|
Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/70
|
2016-07-23 11:33:23 +05:30 |
|
charitha
|
66470f145b
|
Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/118
|
2016-07-23 11:14:59 +05:30 |
|
charitha
|
f071ce0d84
|
Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/83
|
2016-07-23 10:51:14 +05:30 |
|
ayyoob
|
599ad73a72
|
added a configuration ui to connected cup
|
2016-06-17 17:22:04 +05:30 |
|
Sahan Kariyawasam
|
b6cc3147fe
|
Embedded gadget dashboard page in connectedcup analytics page
|
2016-06-09 13:12:33 +05:30 |
|
ayyoob
|
57fd20291b
|
resolving coffeecup issues
|
2016-05-19 03:50:30 +05:30 |
|
ayyoob
|
99c693bcae
|
few fixes after testing
|
2016-05-18 19:34:07 +05:30 |
|
Ruwan
|
b7040ca5c2
|
Merge pull request #118 from charithag/master
Update analytics and configs in connectedcup
|
2016-05-16 16:24:52 +05:30 |
|
charitha
|
c320148a10
|
Update analytics and configs in connectedcup
|
2016-05-16 16:18:19 +05:30 |
|
ayyoob
|
a92eb8bd34
|
refactored connected cup apis
|
2016-05-15 17:46:30 +05:30 |
|
ayyoob
|
d2f223da90
|
few fixes after testing the device type with the refactoring
|
2016-05-14 20:43:27 +05:30 |
|
ayyoob
|
d19da2357b
|
added missing license headers
|
2016-05-14 11:29:17 +05:30 |
|
ayyoob
|
0b893ad64c
|
refactored connected cup analytics scripts
|
2016-05-14 11:11:50 +05:30 |
|
ayyoob
|
d0183deb2a
|
few changes in event recievers and remove type and method from feature
|
2016-05-13 02:54:21 +05:30 |
|
ayyoob
|
14ead035d7
|
few changed mqtt authoriser
|
2016-05-12 13:39:44 +05:30 |
|
Rasika Perera
|
29aca290a4
|
Adding group permission checking
|
2016-05-04 00:49:06 +05:30 |
|
ayyoob
|
ad237ffd34
|
resolved issues in connected cup sample
|
2016-05-03 13:44:08 +05:30 |
|
NuwanSameera
|
4f28e803af
|
Remove monitor operations from controoler api.
|
2016-04-19 17:21:09 +05:30 |
|
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 |
|
charithag
|
a2c016efcc
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-15 11:53:14 +05:30 |
|
charithag
|
dc3540f2ef
|
Merge branch 'master' of https://github.com/charithag/product-iot-server
# Conflicts:
# modules/samples/doormanager/component/pom.xml
|
2016-03-15 11:52:59 +05:30 |
|
GPrathap
|
d9fd45e5ab
|
removed file separator when creating mqtt subscriber topic
|
2016-03-15 11:49:28 +05:30 |
|
Charitha Goonetilleke
|
fbe6ebe9df
|
Fix json library version
|
2016-03-14 23:36:14 +05:30 |
|
Menaka Madushanka
|
f7cf6fe56e
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-14 17:59:10 +05:30 |
|
NuwanSameera
|
ee250d25c5
|
Add permissions.xml to connected-cup device type.
|
2016-03-11 19:16:09 +05:30 |
|
charithag
|
706002b4d5
|
Fix for https://wso2.org/jira/browse/IOTS-77
|
2016-03-10 19:25:50 +05:30 |
|
Menaka Madushanka
|
57f91949a3
|
Code formatting and fixes
|
2016-02-25 14:21:24 +05:30 |
|
Menaka Madushanka
|
cb1c30ec43
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-02-14 01:48:17 +05:30 |
|
Menaka Madushanka
|
c086968e24
|
Added comments and code cleanup
|
2016-02-12 10:23:18 +05:30 |
|
charithag
|
fc702b96b9
|
Bump carbon device mgt plugins version
|
2016-02-11 15:33:10 +05:30 |
|
charithag
|
90dcc43ed1
|
Updated connected cup component structure
|
2016-02-02 16:02:25 +05:30 |
|
Charitha Goonetilleke
|
0c2318c425
|
Merge pull request #83 from charithag/master
Update coffee cup UI
|
2016-01-27 15:14:21 +05:30 |
|
charithag
|
d0c7cddfd0
|
Update coffee cup UI
|
2016-01-27 15:13:20 +05:30 |
|
Ace
|
279c4a1c7a
|
Adding fix for startup error when MB features are not yet up
|
2016-01-27 14:25:50 +05:30 |
|
Ace
|
a3fd8d5134
|
Fixing issues with connected cup sample
|
2016-01-26 09:25:56 +05:30 |
|
Shabirmean
|
9ef829536e
|
Upgraded Paho-MQTT version to latest v1.0.2
|
2016-01-22 18:49:33 +05:30 |
|
Charitha Goonetilleke
|
8aa804bb92
|
Merge pull request #76 from menaka121/master
Connected cup start agent url generation fixed
|
2016-01-18 09:50:52 +05:30 |
|