Commit Graph

2675 Commits

Author SHA1 Message Date
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
charithag
b899f5c3a2 Add device-types to configs 2016-01-04 20:18:50 +05:30
Shabir Mohamed
5b48a66798 Merge pull request #58 from Shabirmean/master
Moved DB Creation for Android and Windows to feature from product pom
2016-01-04 18:49:15 +05:30
Shabirmean
e01a7fe2d8 Moved DB Creation for Android and Windows to feature from product pom 2016-01-04 18:48:17 +05:30
Ace
94dcaa82d8 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-23 11:57:43 +05:30
Ace
ddf04e867e Changing gateway ports to http/https ports 2015-12-23 11:57:13 +05:30
Shabir Mohamed
019b59db26 Merge pull request #57 from Shabirmean/master
Removed device-DB creation from distribution pom and moved to bin.xml
2015-12-23 11:54:27 +05:30
Shabirmean
8bdf2910f9 removed duplicated copy tasks 2015-12-23 11:51:07 +05:30
Shabirmean
078c14f746 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-23 11:00:56 +05:30
Shabirmean
fea8e23da0 Removed device-DB creation from distribution pom and moved to bin.xml copy task 2015-12-23 11:00:44 +05:30
Ace
424dd7979f Adding white listed tag to apim config 2015-12-23 03:41:58 +05:30
Shabirmean
20e24a7b31 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-22 17:58:16 +05:30
Shabir Mohamed
a2e15e10fe Merge pull request #56 from wso2-incubator/revert-55-embed-messaging-feature
Revert "Added mb feature"
2015-12-22 17:57:43 +05:30
Shabir Mohamed
b0f70a9b1b Revert "Added mb feature" 2015-12-22 16:29:25 +05:30
Shabirmean
f8e9356504 Revert "Merge pull request #55 from sdkottegoda/embed-messaging-feature"
This reverts commit fd09122872, reversing
changes made to e340d88608.
2015-12-22 16:27:56 +05:30
ayyoob
fd09122872 Merge pull request #55 from sdkottegoda/embed-messaging-feature
Added mb feature
2015-12-22 14:34:16 +05:30
sdkottegoda
1ee42cc94e Added mb feature 2015-12-22 14:27:13 +05:30
Shabir Mohamed
e340d88608 Merge pull request #54 from Shabirmean/master
Copying APIM customsequences directory from distribution
2015-12-22 12:32:29 +05:30
Shabirmean
98b6cfc487 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-22 12:30:43 +05:30
Shabirmean
d37d73fe36 Copying custom sequences directory from distribution 2015-12-22 12:30:33 +05:30