Commit Graph

191 Commits (c8cd3be0fd729cea798910a864d42fb34ee24544)

Author SHA1 Message Date
charithag 4427f53044 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka b99001ae8d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
GPrathap 4c2eeb4b2a Fix for JIRA IOTS-80
9 years ago
Menaka Madushanka 57f91949a3 Code formatting and fixes
9 years ago
Menaka Madushanka 7cf8fcf4ac Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
charithag c556a9a7b0 Geesara's changes
9 years ago
Ace fca3016181 Bug fixes
9 years ago
Ace bb1216c6bf logic to send event to CEP
9 years ago
Ace 8f8209db08 Adding method to check if user exists
9 years ago
charithag ae08246052 fix issues
9 years ago
charithag 09fbbad7d7 Merge remote-tracking branch 'upstream/master'
9 years ago
GPrathap 1d698a73fd added new devicetype: doormanager
9 years ago
charithag 9e9627f37f upstream merge
9 years ago
charithag 81117d00c4 Change water dispensor category
9 years ago
NuwanSameera cc5cf0e09e Current sensor display name changed to Samrt Meeter
9 years ago
NuwanSameera aa6d02f25c Merge remote-tracking branch 'upstream/master'
9 years ago
NuwanSameera 335632769f Current Sensor controller changes
9 years ago
Menaka Madushanka cb1c30ec43 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka c086968e24 Added comments and code cleanup
9 years ago
charithag fc702b96b9 Bump carbon device mgt plugins version
9 years ago
NuwanSameera 8ca2614a08 Change Current Sensor display name to Water Dispensor
9 years ago
NuwanSameera e64bed8b50 Add flow sensor to currentsensor device type and modify device view page
9 years ago
charithag 463fb50b8f Updated current sensor component structure
9 years ago
NuwanSameera d9624efc80 Add current sensor device type sample
9 years ago
NuwanSameera aff032c66d Add current sensor device type sample
9 years ago
charithag 90dcc43ed1 Updated connected cup component structure
9 years ago
Charitha Goonetilleke 0c2318c425 Merge pull request #83 from charithag/master
9 years ago
charithag d0c7cddfd0 Update coffee cup UI
9 years ago
Ace 279c4a1c7a Adding fix for startup error when MB features are not yet up
9 years ago
Ace 1aef1d10c3 Bug fixes
9 years ago
Ace f9be9a8c0e Improving connected cup UI
9 years ago
Ace a3fd8d5134 Fixing issues with connected cup sample
9 years ago
Ruwan 347b27acf9 Merge pull request #78 from NuwanSameera/master
9 years ago
Shabirmean 9ef829536e Upgraded Paho-MQTT version to latest v1.0.2
9 years ago
NuwanSameera ede2489b38 Connected cup feature pom changes
9 years ago
Charitha Goonetilleke 8aa804bb92 Merge pull request #76 from menaka121/master
9 years ago
Shabirmean 7b5496d4db added the sample connected-cup project as a module into the device-deployer.xml
9 years ago
Menaka Madushanka 41bfb96fe2 Connected cup issues with url generation fixed
9 years ago
Menaka Madushanka 5770ecab2f fixed to get the server ip when starting the agent
9 years ago
Menaka Madushanka f1a22397a3 connected cup agent added
9 years ago
Shabirmean 5f8c04243b Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
ayyoob 3f9e279188 Merge pull request #75 from ayyoob/configConnectedCup
9 years ago
ayyoob 31c745e8f2 few changes in connected cup to remove the dependent with the configuration file
9 years ago
charithag 0ce0c246da Fix minor bugs
9 years ago
charithag a689182eac Fix minor bugs
9 years ago
Shabirmean b769a4ac71 removed duplicate version entry
9 years ago
Ruwan 25fd183278 Merge pull request #72 from NuwanSameera/master
9 years ago
NuwanSameera 06aecec053 connected-cup-agent modified
9 years ago
Ruwan fe2ae62d56 Merge pull request #71 from menaka121/master
9 years ago
Menaka Madushanka 37f22da494 publishedToDAS method changed
9 years ago
charithag 4a971476fb Fix minor bugs
9 years ago
Menaka Madushanka 1ac2dc9307 Issues fixed
9 years ago
Ruwan 54792872ef Merge pull request #69 from menaka121/master
9 years ago
NuwanSameera 568199b507 connected cup agent added to samples
9 years ago
Shabirmean ece55e1016 Small changes to the sample CoffeeCup sample
9 years ago
Menaka Madushanka 6179298d9f Connected cup device added
9 years ago
Menaka Madushanka bc84be58ea Connected cup device added
9 years ago
Shabir Mohamed 10087d78c6 Revert "Updated the sample device-type "ConnectedCup""
9 years ago
Shabirmean 5381fe3e6a Updated the sample device-type ""ConnectedCup
9 years ago
charithag d29fce31b4 Use dependencies from P2
9 years ago
Sumedha Rubasinghe d4e66e9a93 initial version of connectedcup device type
9 years ago
Shabirmean 40ea51d3bf Changed the source of the device-type datasources to copy from.
9 years ago
Shabirmean 19d0d2a116 Added device-type deployer xml to the pack
9 years ago
charithag 2c1efd1af0 Migrated to EMM based product
9 years ago
Shabirmean cbdb4eaece removed unnecessary logs from the VirtualFIreAlarmService
9 years ago
Shabirmean ec98c99894 Added complete SCEP implementation plus end to end encryption for VirtualFireAlarm
9 years ago
Shabirmean af3e30fbc3 synced firealarm web.xml with virtual_firealarm web.xml
9 years ago
Shabirmean d28a2bf4b3 Changes for the FireAlarmService to work with real device and SCEP service inclusions
9 years ago
Menaka Madushanka c8e85ce0db resources.xml file added
9 years ago
Ace f5f5356e35 Restructirng samples
9 years ago
Rasika Perera 44f380c8e0 changes to the resources.xml
9 years ago
Rasika Perera 4c07301c8c upgrading carbon analytics versions
9 years ago
Ace 5a090d93df Adding property to pickup application name from web.xml
9 years ago
Charitha Goonetilleke a337fefd8d Merge pull request #19 from charithag/master
9 years ago
Ace 1d2d57259b fixing some minor bugs
9 years ago
charithag fe59fa9410 Add simple and advanced fire alarm agents
9 years ago
charithag e8a0ccf6e3 Fire alarm changes done by Shabir
9 years ago
ayyoob bf9bfd40b5 few changes after testing
9 years ago
ayyoob a0ee671515 resolved errors on sample build and few changes on android service
9 years ago
ayyoob e39ee91518 update version and few changes on android sense service
9 years ago
Rasika Perera ec70dad7da refactoring
9 years ago
charithag 82740dec44 Revert pom changes to previous
9 years ago
Rasika Perera b6156af241 refactoring
9 years ago
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
charithag ae1f904082 Deploy firealarm-webapp with virtual-firealarm sample
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
charithag 306646c51d Change virtual device "Download" button text to "Create a Device".
9 years ago
Shabirmean 75b4e5ff27 changes to the VirtualFireAlarm service to send and receive XMPP,MQTT messages
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
charithag e4f0cd3059 Fix sample deployment issue for samples except virtual fire alarm
9 years ago