Commit Graph

658 Commits

Author SHA1 Message Date
GPrathap
4c2eeb4b2a Fix for JIRA IOTS-80 2016-02-25 23:52:21 +05:30
GPrathap
d9f48423e3 Fix for JIRA IOTS-79 2016-02-25 19:25:06 +05:30
Ruwan
bcbbcc418a Merge pull request #94 from GPrathap/master
added mqtt dependency to sample agent application
2016-02-25 10:35:29 +05:30
Ace
be7812722e Upgrading commons version 2016-02-25 10:30:13 +05:30
GPrathap
a4695dfb2c added mqtt dependency to sample agent application 2016-02-25 08:29:15 +05:30
Ace
7b51e4f36b bumping dependencies to latest versions 2016-02-24 16:33:56 +05:30
Ruwan
ccd6d0bf6e Merge pull request #93 from GPrathap/master
added deployable sample  application
2016-02-24 12:22:32 +05:30
GPrathap
953b15342f updated README.md 2016-02-24 12:17:19 +05:30
GPrathap
d59f7bc089 added deployable sample application 2016-02-24 11:34:00 +05:30
Charitha Goonetilleke
898634e01e Merge pull request #92 from charithag/master
Fix issues
2016-02-16 23:12:38 +05:30
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
Charitha Goonetilleke
6d8605862d Merge pull request #91 from GPrathap/master
added new devicetype: doormanager
2016-02-16 19:35:15 +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
ayyoob
cdd3e3aa3c Merge pull request #90 from NuwanSameera/master
Current sensor display name changed to Samrt Meeter
2016-02-15 13:23:01 +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
Charitha Goonetilleke
a40da8416d Merge pull request #89 from charithag/master
Bump carbon device mgt plugins version
2016-02-11 15:34:26 +05:30
charithag
fc702b96b9 Bump carbon device mgt plugins version 2016-02-11 15:33:10 +05:30
Shabir Mohamed
d468b741f8 Merge pull request #88 from Shabirmean/master
Removed already installed features from the "../components/features"
2016-02-10 17:33:36 +05:30
Shabirmean
8f4093b20f Removed already installed features from the "repository/components/features" folder 2016-02-10 17:32:25 +05:30
Ace
a62f8025a2 updating mb feature version 2016-02-10 11:54:03 +05:30
Ruwan
2e7637eda5 Merge pull request #86 from NuwanSameera/master
Change Current Sensor display name to Water Dispensor
2016-02-08 18:24:02 +05:30
NuwanSameera
8ca2614a08 Change Current Sensor display name to Water Dispensor 2016-02-08 17:42:40 +05:30
Charitha Goonetilleke
95b3396a66 Merge pull request #85 from NuwanSameera/master
Add flow sensor to currentsensor device type and modify device view page
2016-02-08 16:12:43 +05:30
NuwanSameera
e64bed8b50 Add flow sensor to currentsensor device type and modify device view page 2016-02-08 16:07:32 +05:30
Ace
b91f27571f Updating to latest AM version 2016-02-05 12:23:14 +05:30
Charitha Goonetilleke
0aa7e202ef Merge pull request #84 from charithag/IoTS-1.0.0-M3
M3 changes
2016-02-03 10:35:01 +05:30
Ace
4e4bc61dfd upgrading event processing & messaging components to released versions 2016-02-03 09:41:39 +05:30
charithag
463fb50b8f Updated current sensor component structure 2016-02-02 21:27:23 +05:30
Charitha Goonetilleke
dd2b1ceb29 Merge pull request #4 from NuwanSameera/IoTS-1.0.0-M3
Add current sensor device type sample
2016-02-02 16:17:05 +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
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