Commit Graph

357 Commits

Author SHA1 Message Date
ayyoob
fd2e7c3ed2 DAS update 2015-10-16 16:58:39 +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
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
Shabir Mohamed
5d0f0c9a42 small corrections with firealarm sample 2015-10-11 15:37:03 +05:30
Shabir Mohamed
e7bf722c48 removing unnecessary util code 2015-10-10 09:59:54 +05:30
Shabir Mohamed
5d17940da4 added changes for the firealarmagent download 2015-10-09 19:41:20 +05:30
Ace
9e010dacba Fixing issue when building samples inside the pack 2015-10-09 14:05:30 +05:30
charithag
4c64456b36 Add ES themed login page 2015-10-08 14:19:56 +05:30
Ace
933b01a4f8 Adding fix for MT issue and missing config files 2015-10-08 11:47:40 +05:30
Ace
57da4fb9c4 changing bin.xml to fix duplicate files in pack 2015-10-07 12:21:16 +05:30
charithag
b4e9b84536 Fix build issue in samples 2015-10-06 11:20:19 +05:30
charithag
3045bc068a Fix enrolling exception in raspberry pi device type 2015-10-05 15:29:36 +05:30
charithag
9b6f1817f9 Fix for class def not found 2015-10-05 14:58:34 +05:30
charithag
b525895ac2 Fix sso-idp-config issue 2015-10-05 12:01:28 +05:30
ayyoob
b7daf92ada Integrated DAS for stat 2015-10-05 03:13:54 +05:30
charithag
20b5469e2a Fixed raspberry icon 2015-10-04 21:27:41 +05:30
charithag
864ee63807 Fix sso issue and copy sso-idp-configs.xml from src/repository to pack 2015-10-04 19:55:28 +05:30
ayyoob
a2ffaf170d updated jaggery version and added ES IDP configs 2015-10-04 01:50:27 +05:30
ayyoob
fc4e53de99 Merge pull request #2 from ayyoob/ayyoob
Merged APIM, DAS and ES features
2015-10-01 16:50:16 +05:30