Commit Graph

822 Commits

Author SHA1 Message Date
charithag
90dcc43ed1 Updated connected cup component structure 2016-02-02 16:02:25 +05:30
charithag
a72cee943e Bump analytic version to latest 2016-02-02 14:06:35 +05:30
charithag
74c04dc49b Merged with CDM master 2016-01-28 17:44:10 +05:30
Charitha Goonetilleke
0c2318c425 Merge pull request #83 from charithag/master
Update coffee cup UI
2016-01-27 15:14:21 +05:30
charithag
d0c7cddfd0 Update coffee cup UI 2016-01-27 15:13:20 +05:30
Ace
279c4a1c7a Adding fix for startup error when MB features are not yet up 2016-01-27 14:25:50 +05:30
Ace
1aef1d10c3 Bug fixes 2016-01-27 13:08:57 +05:30
Ace
f9be9a8c0e Improving connected cup UI 2016-01-27 12:09:34 +05:30
Ace
a3fd8d5134 Fixing issues with connected cup sample 2016-01-26 09:25:56 +05:30
Ruwan
347b27acf9 Merge pull request #78 from NuwanSameera/master
Connected cup feature pom changes requested by menaka
2016-01-26 08:42:49 +05:30
Ace
94f1b87ce3 Removing patches and upgrading DAS and MB 2016-01-25 10:47:31 +05:30
Shabir Mohamed
429e9981ec Merge pull request #82 from Shabirmean/master
Upgraded Paho-MQTT version to latest v1.0.2
2016-01-22 18:51:28 +05:30
Shabirmean
fd0f149c61 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-01-22 18:49:44 +05:30
Shabirmean
9ef829536e Upgraded Paho-MQTT version to latest v1.0.2 2016-01-22 18:49:33 +05:30
Ruwan
0112f4c5fc Merge pull request #81 from GPrathap/master
removed auto generated device-deployer.xml
2016-01-22 15:05:09 +05:30
GPrathap
7bd44f4499 removed auto generated device-deployer.xml 2016-01-22 14:40:46 +05:30
Shabir Mohamed
f3fe4a2757 Merge pull request #80 from Shabirmean/master
Fixing wrong parent-groupId in the tools module
2016-01-20 11:44:57 +05:30
Shabirmean
390bda1b3a Fixing wrong parent-groupId in the tools module 2016-01-20 11:44:06 +05:30
Charitha Goonetilleke
38d67629d0 Merge pull request #79 from GPrathap/master
added a new maven archetype to generate sample application of cdmf device type
2016-01-20 10:52:02 +05:30
GPrathap
17db3bc651 created auto generated device-deployer.xml file 2016-01-20 09:40:14 +05:30
GPrathap
84dc857811 facilitated to create a feature of given device type dynamically 2016-01-19 23:28:53 +05:30
GPrathap
a9750a2680 added a new maven archetype to generate sample structure of cdmf device type 2016-01-19 14:11:00 +05:30
NuwanSameera
ede2489b38 Connected cup feature pom changes 2016-01-19 12:45:46 +05:30
Charitha Goonetilleke
8aa804bb92 Merge pull request #76 from menaka121/master
Connected cup start agent url generation fixed
2016-01-18 09:50:52 +05:30
Shabir Mohamed
665705eee5 Merge pull request #77 from Shabirmean/master
added the sample connected-cup project as a module into the device-deployer.xml
2016-01-14 16:58:36 +05:30
Shabirmean
7b5496d4db added the sample connected-cup project as a module into the device-deployer.xml 2016-01-14 16:56:04 +05:30
Menaka Madushanka
41bfb96fe2 Connected cup issues with url generation fixed 2016-01-14 15:59:11 +05:30
Menaka Madushanka
5770ecab2f fixed to get the server ip when starting the agent 2016-01-14 15:04:56 +05:30
Menaka Madushanka
f1a22397a3 connected cup agent added 2016-01-14 14:39:56 +05:30
Shabirmean
5f8c04243b Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-01-13 19:01:04 +05:30
ayyoob
3f9e279188 Merge pull request #75 from ayyoob/configConnectedCup
few changes in connected cup to remove the dependent with the configu…
2016-01-13 18:43:54 +05:30
ayyoob
31c745e8f2 few changes in connected cup to remove the dependent with the configuration file 2016-01-13 17:41:05 +05:30
Charitha Goonetilleke
6e46e8d8ca Merge pull request #74 from charithag/master
Fix minor bugs
2016-01-13 16:50:06 +05:30
charithag
0ce0c246da Fix minor bugs 2016-01-13 16:49:38 +05:30
Charitha Goonetilleke
f4c796acbc Merge pull request #73 from charithag/master
Fix minor bugs
2016-01-13 16:40:22 +05:30
charithag
a689182eac Fix minor bugs 2016-01-13 16:39:46 +05:30
Shabirmean
b769a4ac71 removed duplicate version entry 2016-01-13 16:02:05 +05:30
Ruwan
25fd183278 Merge pull request #72 from NuwanSameera/master
connected-cup-agent modified
2016-01-13 15:35:01 +05:30
NuwanSameera
06aecec053 connected-cup-agent modified 2016-01-13 15:34:00 +05:30
Ruwan
fe2ae62d56 Merge pull request #71 from menaka121/master
publishedToDAS method changed
2016-01-13 15:33:31 +05:30
Menaka Madushanka
37f22da494 publishedToDAS method changed 2016-01-13 15:30:50 +05:30
Charitha Goonetilleke
50ba5cf277 Merge pull request #70 from charithag/master
Fix minor bugs
2016-01-13 15:21:33 +05:30
charithag
4a971476fb Fix minor bugs 2016-01-13 15:20:53 +05:30
Menaka Madushanka
1ac2dc9307 Issues fixed 2016-01-13 15:17:36 +05:30
Ruwan
54792872ef Merge pull request #69 from menaka121/master
Issues fixed
2016-01-13 15:17:25 +05:30
Ruwan
61bc5c23d1 Merge pull request #68 from NuwanSameera/master
connected-cup-agent added to samples
2016-01-13 14:48:49 +05:30
NuwanSameera
568199b507 connected cup agent added to samples 2016-01-13 14:45:28 +05:30
Shabir Mohamed
7180059df0 Merge pull request #67 from Shabirmean/master
Small changes to the sample CoffeeCup sample
2016-01-13 11:36:59 +05:30
Shabirmean
ece55e1016 Small changes to the sample CoffeeCup sample 2016-01-13 11:35:33 +05:30
Ruwan
078f7675bf Merge pull request #66 from menaka121/master
Connected cup
2016-01-13 11:27:09 +05:30