Commit Graph

23 Commits

Author SHA1 Message Date
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
charithag
e4f0cd3059 Fix sample deployment issue for samples except virtual fire alarm 2015-10-16 15:40:50 +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
Shabir Mohamed
90ad9802bc Merge branch 'build-pack' 2015-10-14 22:04: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
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
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
charithag
454a403a22 Merge remote-tracking branch 'upstream/build-pack' into build-pack 2015-10-12 11:12:20 +05:30
Shabir Mohamed
45c0d9bc03 added XMPPClient and MQTTClient for receiving incoming messages 2015-10-12 10:46:04 +05:30
charithag
cfcc69b6fc Fix issue with cnnecting remote APIM 2015-10-12 01:18:30 +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
Shabir Mohamed
a47232c8e1 changed deviceType to “firealarm” to obtain APIMToken and updated Agent
jar/startup script
2015-10-11 17:29:54 +05:30
Shabir Mohamed
13792a56a4 added new deviceType VirtualAgent 2015-10-11 16:09:58 +05:30