Commit Graph

2675 Commits

Author SHA1 Message Date
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
Charitha Goonetilleke
bad1823069 Merge pull request #7 from wso2-incubator/build-pack
Move build pack to master
2015-10-13 11:11:07 +05:30
Charitha Goonetilleke
7f83f1361d Merge pull request #6 from charithag/build-pack
Add components necessory to work with internal APIM
2015-10-13 11:08:22 +05:30
charithag
76de89bd05 Add components necessory to work with internal APIM 2015-10-13 00:46:26 +05:30
ayyoob
ecd8c75660 few changes to resolve the error on matt 2015-10-12 19:42:50 +05:30
ayyoob
183d53eea6 Merge branch 'build-pack' of https://github.com/wso2-incubator/product-device-cloud into build-pack 2015-10-12 13:13:20 +05:30
Charitha Goonetilleke
33edc31644 Merge pull request #5 from charithag/build-pack
Fix certificate issue in FireAlarmVirtualAgent for mac
2015-10-12 13:05:22 +05:30
charithag
4d5b6d8bff Fix certificate issue in FireAlarmVirtualAgent for mac 2015-10-12 13:04:31 +05:30
ayyoob
388af5f248 merged with upstream 2015-10-12 11:56:22 +05:30
ayyoob
08c518c0c2 added api managed on virtual fire alarm and few changes on internal api 2015-10-12 11:37:24 +05:30
Charitha Goonetilleke
8b422cb509 Merge pull request #3 from charithag/build-pack
Include virtual agent to build pack & fix remote APIM connecting issue
2015-10-12 11:16:09 +05:30
charithag
454a403a22 Merge remote-tracking branch 'upstream/build-pack' into build-pack 2015-10-12 11:12:20 +05:30
Shabir Mohamed
85ed06e12a merge conflicts with build-pack branch 2015-10-12 11:01:37 +05:30
Shabir Mohamed
45c0d9bc03 added XMPPClient and MQTTClient for receiving incoming messages 2015-10-12 10:46:04 +05:30
Rasika Perera
e04b174c1b Merge pull request #4 from rasika90/build-pack
adding policy monitor service for firealarm
2015-10-12 08:22:07 +05:30
Rasika Perera
d384942f69 adding policy monitor service for firealarm 2015-10-12 08:12:52 +05:30
charithag
cfcc69b6fc Fix issue with cnnecting remote APIM 2015-10-12 01:18:30 +05:30
charithag
b63c062eb8 Include virtual agent to pack by default 2015-10-11 20:33:04 +05:30
charithag
a73cf7213d Set to build firealarm virtual agent from source in git 2015-10-11 20:32:47 +05:30
Shabir Mohamed
f8dca4dd8f changed firealarm thumbnail 2015-10-11 18:14:13 +05:30