ayyoob
|
e39ee91518
|
update version and few changes on android sense service
|
2015-10-24 21:20:56 +05:30 |
|
Rasika Perera
|
33eb1b6fa8
|
Merge pull request #17 from rasika90/master
refactoring
|
2015-10-23 12:36:49 +05:30 |
|
Rasika Perera
|
ec70dad7da
|
refactoring
|
2015-10-23 12:34:19 +05:30 |
|
Charitha Goonetilleke
|
dc7cbadcde
|
Merge pull request #16 from charithag/master
Revert virtual agent pom changes to previous
|
2015-10-23 12:31:37 +05:30 |
|
charithag
|
82740dec44
|
Revert pom changes to previous
|
2015-10-23 12:29:38 +05:30 |
|
Rasika Perera
|
49c177af1c
|
Merge pull request #15 from rasika90/master
refactoring
|
2015-10-23 11:17:32 +05:30 |
|
Rasika Perera
|
b6156af241
|
refactoring
|
2015-10-23 11:16:32 +05:30 |
|
Rasika Perera
|
42236f390f
|
Merge pull request #14 from rasika90/master
Migrating in memory sensor manager
|
2015-10-23 11:03:45 +05:30 |
|
Rasika Perera
|
82f1f645fd
|
resolving conflicts
|
2015-10-23 11:02:12 +05:30 |
|
Rasika Perera
|
6fabb28b1c
|
migrating in memory sensor manager
|
2015-10-23 10:50:51 +05:30 |
|
Shabirmean
|
7664f73b4e
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
Conflicts:
modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmService.java
modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dao/DeviceRecord.java
modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dao/TemperatureRecord.java
modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dto/TemperatureRecord.java
modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/util/DataHolder.java
|
2015-10-23 10:30:36 +05:30 |
|
Shabirmean
|
5bf09ef1ed
|
changed package from dao to dot
|
2015-10-23 10:21:24 +05:30 |
|
ayyoob
|
5625b83b64
|
added android sense service and required stream definitions
|
2015-10-23 07:42:29 +05:30 |
|
Rasika Perera
|
fb21dc8b72
|
Merge pull request #13 from rasika90/master
Generalizing in memory map into any sensor reading
|
2015-10-23 01:11:11 +05:30 |
|
Rasika Perera
|
e31fda92a6
|
generalizing inmemory map into any sensor
|
2015-10-23 01:04:55 +05:30 |
|
Rasika Perera
|
50e90fa8de
|
generalizing inmemory map into any sensor
|
2015-10-23 01:04:32 +05:30 |
|
Charitha Goonetilleke
|
4ae7f221c5
|
Merge pull request #12 from charithag/master
Deploy firealarm-webapp with virtual-firealarm sample
|
2015-10-22 21:21:11 +05:30 |
|
charithag
|
ae1f904082
|
Deploy firealarm-webapp with virtual-firealarm sample
|
2015-10-22 21:20:17 +05:30 |
|
charithag
|
16f1fc7d5e
|
Remove duplicate portal jaggery app
|
2015-10-22 19:11:08 +05:30 |
|
Charitha Goonetilleke
|
e88019a56c
|
Merge pull request #11 from charithag/master
Add in memory hash table to hold last received temperature data
|
2015-10-22 17:50:48 +05:30 |
|
charithag
|
e9dc4c9097
|
Add in memory hash table to hold last received temperature data
|
2015-10-22 17:49:10 +05:30 |
|
Shabirmean
|
bf5fad5409
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2015-10-22 12:31:37 +05:30 |
|
Shabirmean
|
e9d08faa6c
|
added changes to publish data received via MQTT and XMPP
|
2015-10-22 12:31:28 +05:30 |
|
Charitha Goonetilleke
|
08f4829eea
|
Merge pull request #10 from charithag/master
Changes suggested by PC1 and Kernel upgrade
|
2015-10-22 08:00:02 +05:30 |
|
charithag
|
88aad8a30a
|
Upgrated to kernel 4.4.2 to comply with latest DAS changes
|
2015-10-22 07:52:57 +05:30 |
|
charithag
|
928dd66ae3
|
License updated
|
2015-10-22 07:52:19 +05:30 |
|
charithag
|
36bf7a529a
|
Redirect user to the login page upon successful registration
|
2015-10-22 06:51:53 +05:30 |
|
charithag
|
306646c51d
|
Change virtual device "Download" button text to "Create a Device".
|
2015-10-22 06:50:55 +05:30 |
|
charithag
|
08d2d9d6a7
|
Removed un used cdm dbscripts
|
2015-10-22 06:48:00 +05:30 |
|
Shabirmean
|
75b4e5ff27
|
changes to the VirtualFireAlarm service to send and receive XMPP,MQTT messages
|
2015-10-20 20:21:02 +05:30 |
|
ayyoob
|
ec47429127
|
few changes after testing
|
2015-10-16 18:30:19 +05:30 |
|
ayyoob
|
aa001675b3
|
Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud
|
2015-10-16 16:58:58 +05:30 |
|
ayyoob
|
2d2ab1cdf3
|
update the bin file
|
2015-10-16 16:58:51 +05:30 |
|
ayyoob
|
fd2e7c3ed2
|
DAS update
|
2015-10-16 16:58:39 +05:30 |
|
Shabirmean
|
ae05b84c79
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2015-10-16 16:27:49 +05:30 |
|
Shabirmean
|
a5df23b565
|
changed the terminal print text in the startup script of virtual_firealarm
|
2015-10-16 16:27:42 +05:30 |
|
Charitha Goonetilleke
|
38e695c032
|
Merge pull request #9 from charithag/master
Fix sample deployment issue for samples except virtual fire alarm
|
2015-10-16 15:43:26 +05:30 |
|
charithag
|
e4f0cd3059
|
Fix sample deployment issue for samples except virtual fire alarm
|
2015-10-16 15:40:50 +05:30 |
|
ayyoob
|
cfd1497ecc
|
Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud
|
2015-10-15 20:36:44 +05:30 |
|
Shabirmean
|
c37a97d7b4
|
removed hardcoded deviceName
|
2015-10-15 12:25:53 +05:30 |
|
Shabirmean
|
9070110818
|
added changes to receive customDeviceName from user and register device using this value
|
2015-10-15 12:21:04 +05:30 |
|
Shabirmean
|
38457554a5
|
changes to take in both https and http server endpoints
|
2015-10-14 23:50:50 +05:30 |
|
Shabir Mohamed
|
695571011c
|
changed button label from "Download" to "Download Agent"
|
2015-10-14 23:28:15 +05:30 |
|
ayyoob
|
d4fc698b4f
|
Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud
|
2015-10-14 22:38:25 +05:30 |
|
ayyoob
|
0cde75e8a1
|
changed DAS to SNAPSHOT version
|
2015-10-14 22:38:18 +05:30 |
|
Shabir Mohamed
|
90ad9802bc
|
Merge branch 'build-pack'
|
2015-10-14 22:04:43 +05:30 |
|
Charitha Goonetilleke
|
562f71d2b8
|
Merge pull request #8 from charithag/master
Virtual firealarm icon updated
|
2015-10-14 20:30:43 +05:30 |
|
charithag
|
f9dff1b0ed
|
Virtual firealarm icon updated
|
2015-10-14 20:28:31 +05:30 |
|
Shabir Mohamed
|
69dcf064f9
|
merged conflicts with the changes of combining the device controller
and the manager together
|
2015-10-13 15:33:32 +05:30 |
|
Shabir Mohamed
|
c13e5ac620
|
Added MQTT-Subscriber and XMPP-Connector for the virtual_firealarm
deviceType
|
2015-10-13 13:28:26 +05:30 |
|