Commit Graph

1894 Commits

Author SHA1 Message Date
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
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
58f8c94f84 Merge pull request #65 from wso2-incubator/revert-64-master
Revert "Updated the sample device-type "ConnectedCup""
2016-01-12 22:46:56 +05:30
Shabir Mohamed
10087d78c6 Revert "Updated the sample device-type "ConnectedCup"" 2016-01-12 22:46:45 +05:30
Shabir Mohamed
069fe170fb Merge pull request #64 from Shabirmean/master
Updated the sample device-type "ConnectedCup"
2016-01-12 22:38:20 +05:30
Shabirmean
112dce257f Merge branch 'master' of https://github.com/Shabirmean/product-iot-server 2016-01-12 22:35:05 +05:30
Shabirmean
5381fe3e6a Updated the sample device-type ""ConnectedCup 2016-01-12 22:32:27 +05:30
Shabirmean
4dd949e63c Updated the sample device-type ""ConnectedCup 2016-01-12 22:09:57 +05:30
Shabirmean
cf6f3d11b0 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-01-12 14:13:14 +05:30
Charitha Goonetilleke
2c3b712d0e Merge pull request #63 from charithag/master
Use dependencies from P2
2016-01-12 14:12:06 +05:30
charithag
d29fce31b4 Use dependencies from P2 2016-01-12 14:11:03 +05:30
Charitha Goonetilleke
c576d04cf3 Merge pull request #62 from charithag/master
Remove IOS Mobile Plugin Management schema & Change zip archive name to wso2iots
2016-01-12 12:42:31 +05:30
charithag
3201b2e112 Change zip archive name to wso2iots 2016-01-12 12:40:53 +05:30
charithag
d67ff8cd98 Removed IOS Mobile Plugin Management schema 2016-01-12 11:25:39 +05:30
charithag
128ce27185 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-01-12 10:27:08 +05:30
Shabirmean
35b717680a Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2-incubator/product-iot-server 2016-01-11 13:02:49 +05:30
ayyoob
2a30023d81 Merge pull request #61 from wso2-incubator/IoTS-1.0.0-M1
added start up script
2016-01-08 23:10:35 +05:30
ayyoob
754891e39a added start up script 2016-01-08 20:56:21 +05:30
charithag
d84669d00a Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-01-08 12:21:18 +05:30
Ace
03a05472c4 Adding andes patch 2016-01-08 12:05:42 +05:30
charithag
542f19bf41 Disable integration tests 2016-01-08 11:19:20 +05:30
Ace
fad444510c Adding log fixes to spark core 2016-01-07 22:28:33 +05:30
Ace
a8ca6887f8 Adding fixes for DAS components to co-exist with MB components 2016-01-07 19:07:04 +05:30
Ace
82c0c226f9 Including mb features in pack 2016-01-06 10:51:21 +05:30
Ace
4752b12545 Integrating mb features to IotServer 2016-01-05 19:13:23 +05:30
Shabir Mohamed
8ea7931425 Merge pull request #60 from Shabirmean/master
Force add the temporary jars relevant to DAS fix patches
2016-01-05 11:02:06 +05:30
Shabirmean
f29fa5e89e Force add the temporary jars relevant to DAS fix patches 2016-01-05 11:00:53 +05:30
Ruwan
337bdb3929 Merge pull request #59 from charithag/master
Add device-types to configs
2016-01-04 20:53:22 +05:30