130 Commits

Author	SHA1	Message	Date
charithag	ae08246052	fix issues	2016-02-16 23:07:20 +05:30
charithag	09fbbad7d7	Merge remote-tracking branch 'upstream/master'	2016-02-16 19:37:09 +05:30
GPrathap	1d698a73fd	added new devicetype: doormanager	2016-02-16 19:32:21 +05:30
charithag	9e9627f37f	upstream merge	2016-02-16 19:26:06 +05:30
charithag	81117d00c4	Change water dispensor category	2016-02-16 19:21:43 +05:30
NuwanSameera	cc5cf0e09e	Current sensor display name changed to Samrt Meeter	2016-02-15 13:17:21 +05:30
NuwanSameera	aa6d02f25c	Merge remote-tracking branch 'upstream/master'	2016-02-15 09:50:26 +05:30
NuwanSameera	335632769f	Current Sensor controller changes	2016-02-15 09:49:51 +05:30
charithag	fc702b96b9	Bump carbon device mgt plugins version	2016-02-11 15:33:10 +05:30
NuwanSameera	8ca2614a08	Change Current Sensor display name to Water Dispensor	2016-02-08 17:42:40 +05:30
NuwanSameera	e64bed8b50	Add flow sensor to currentsensor device type and modify device view page	2016-02-08 16:07:32 +05:30
charithag	463fb50b8f	Updated current sensor component structure	2016-02-02 21:27:23 +05:30
NuwanSameera	d9624efc80	Add current sensor device type sample	2016-02-02 16:13:46 +05:30
NuwanSameera	aff032c66d	Add current sensor device type sample	2016-02-02 16:13:10 +05:30
charithag	90dcc43ed1	Updated connected cup component structure	2016-02-02 16:02:25 +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
Shabirmean	9ef829536e	Upgraded Paho-MQTT version to latest v1.0.2	2016-01-22 18:49:33 +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
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
charithag	0ce0c246da	Fix minor bugs	2016-01-13 16:49:38 +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
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
NuwanSameera	568199b507	connected cup agent added to samples	2016-01-13 14:45:28 +05:30
Shabirmean	ece55e1016	Small changes to the sample CoffeeCup sample	2016-01-13 11:35:33 +05:30
Menaka Madushanka	6179298d9f	Connected cup device added	2016-01-13 11:11:55 +05:30
Menaka Madushanka	bc84be58ea	Connected cup device added	2016-01-13 11:09:38 +05:30
Shabir Mohamed	10087d78c6	Revert "Updated the sample device-type "ConnectedCup""	2016-01-12 22:46:45 +05:30
Shabirmean	5381fe3e6a	Updated the sample device-type ""ConnectedCup	2016-01-12 22:32:27 +05:30
charithag	d29fce31b4	Use dependencies from P2	2016-01-12 14:11:03 +05:30
Sumedha Rubasinghe	d4e66e9a93	initial version of connectedcup device type	2015-12-22 08:27:05 +05:30