Commit Graph

636 Commits (d468b741f842ad740f0e307c47c09a3f00d9ac0b)
 

Author SHA1 Message Date
Rasika Perera 82f1f645fd resolving conflicts
9 years ago
Rasika Perera 6fabb28b1c migrating in memory sensor manager
9 years ago
Shabirmean 7664f73b4e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean 5bf09ef1ed changed package from dao to dot
9 years ago
ayyoob 5625b83b64 added android sense service and required stream definitions
9 years ago
Rasika Perera fb21dc8b72 Merge pull request #13 from rasika90/master
9 years ago
Rasika Perera e31fda92a6 generalizing inmemory map into any sensor
9 years ago
Rasika Perera 50e90fa8de generalizing inmemory map into any sensor
9 years ago
Charitha Goonetilleke 4ae7f221c5 Merge pull request #12 from charithag/master
9 years ago
charithag ae1f904082 Deploy firealarm-webapp with virtual-firealarm sample
9 years ago
charithag 16f1fc7d5e Remove duplicate portal jaggery app
9 years ago
Charitha Goonetilleke e88019a56c Merge pull request #11 from charithag/master
9 years ago
charithag e9dc4c9097 Add in memory hash table to hold last received temperature data
9 years ago
Shabirmean bf5fad5409 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean e9d08faa6c added changes to publish data received via MQTT and XMPP
9 years ago
Charitha Goonetilleke 08f4829eea Merge pull request #10 from charithag/master
9 years ago
charithag 88aad8a30a Upgrated to kernel 4.4.2 to comply with latest DAS changes
9 years ago
charithag 928dd66ae3 License updated
9 years ago
charithag 36bf7a529a Redirect user to the login page upon successful registration
9 years ago
charithag 306646c51d Change virtual device "Download" button text to "Create a Device".
9 years ago
charithag 08d2d9d6a7 Removed un used cdm dbscripts
9 years ago
Shabirmean 75b4e5ff27 changes to the VirtualFireAlarm service to send and receive XMPP,MQTT messages
9 years ago
ayyoob ec47429127 few changes after testing
9 years ago
ayyoob aa001675b3 Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud
9 years ago
ayyoob 2d2ab1cdf3 update the bin file
9 years ago
ayyoob fd2e7c3ed2 DAS update
9 years ago
Shabirmean ae05b84c79 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean a5df23b565 changed the terminal print text in the startup script of virtual_firealarm
9 years ago
Charitha Goonetilleke 38e695c032 Merge pull request #9 from charithag/master
9 years ago
charithag e4f0cd3059 Fix sample deployment issue for samples except virtual fire alarm
9 years ago
ayyoob cfd1497ecc Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud
9 years ago
Shabirmean c37a97d7b4 removed hardcoded deviceName
9 years ago
Shabirmean 9070110818 added changes to receive customDeviceName from user and register device using this value
9 years ago
Shabirmean 38457554a5 changes to take in both https and http server endpoints
9 years ago
Shabir Mohamed 695571011c changed button label from "Download" to "Download Agent"
9 years ago
ayyoob d4fc698b4f Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud
9 years ago
ayyoob 0cde75e8a1 changed DAS to SNAPSHOT version
9 years ago
Shabir Mohamed 90ad9802bc Merge branch 'build-pack'
9 years ago
Charitha Goonetilleke 562f71d2b8 Merge pull request #8 from charithag/master
9 years ago
charithag f9dff1b0ed Virtual firealarm icon updated
9 years ago
Shabir Mohamed 69dcf064f9 merged conflicts with the changes of combining the device controller
9 years ago
Shabir Mohamed c13e5ac620 Added MQTT-Subscriber and XMPP-Connector for the virtual_firealarm
9 years ago
Charitha Goonetilleke bad1823069 Merge pull request #7 from wso2-incubator/build-pack
9 years ago
Charitha Goonetilleke 7f83f1361d Merge pull request #6 from charithag/build-pack
9 years ago
charithag 76de89bd05 Add components necessory to work with internal APIM
9 years ago
ayyoob ecd8c75660 few changes to resolve the error on matt
9 years ago
ayyoob 183d53eea6 Merge branch 'build-pack' of https://github.com/wso2-incubator/product-device-cloud into build-pack
9 years ago
Charitha Goonetilleke 33edc31644 Merge pull request #5 from charithag/build-pack
9 years ago
charithag 4d5b6d8bff Fix certificate issue in FireAlarmVirtualAgent for mac
9 years ago
ayyoob 388af5f248 merged with upstream
9 years ago