Commit Graph

1550 Commits

Author SHA1 Message Date
ayyoob
f7399060e5 moved the configs to gateway 2017-01-12 19:30:17 +05:30
ayyoob
4ca84a9f2d Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-12 11:25:37 +05:30
ayyoob
03150ad70f made android and windows to be available by default 2017-01-12 11:13:10 +05:30
ayyoob
648b276491 few changes after testing the cluster 2017-01-12 11:12:49 +05:30
Rasika Perera
38e3f90240 Merge pull request #250 from ayyoob/3.0.0
added missing features updated configs
2017-01-11 13:24:46 +05:30
Rasika Perera
205dd41b0a Merge pull request #231 from dimuthnc/master
location-data-visualizer sample added to product-iots/modules/samples
2017-01-11 13:24:31 +05:30
ayyoob
e6ce91885d added missing components for profile 2017-01-11 13:08:36 +05:30
Rasika Perera
f0f2801aee Merge pull request #249 from charithag/master-connectedcup
Fix issues in connectedcup device
2017-01-10 17:06:44 +05:30
charitha
5feb7f82f2 Fix issues in connectedcup device 2017-01-10 16:47:28 +05:30
ayyoob
9f366902b1 Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-10 03:32:41 +05:30
ayyoob
63200bec45 added missing features and configurations 2017-01-10 03:09:57 +05:30
Rasika Perera
85c5be77c3 Merge pull request #248 from menakaj/master
Fixing the existing UI integration tests.
2017-01-09 17:02:24 +05:30
Menaka Jayawardena
ae8aec6a4e Fixing the existing UI integration tests. 2017-01-09 16:59:05 +05:30
Rasika Perera
df3a2deeea Merge pull request #246 from madhawap/master
fixes to plugins-deployer.xml
2017-01-09 14:59:41 +05:30
madhawap
07e7cb4a0a fixes to plugins-deployer.xml 2017-01-09 14:56:59 +05:30
Rasika Perera
bfc3882592 Merge pull request #245 from menakaj/master
Enabling Integration tests in parent pom
2017-01-09 14:45:48 +05:30
Menaka Jayawardena
370ed5fd98 Changing pom versions to match with parent. 2017-01-09 14:06:05 +05:30
Menaka Jayawardena
52290cf485 Disabling UI tests in build time by default. 2017-01-09 13:29:05 +05:30
Menaka Jayawardena
0382a98d30 Enabling Integration tests in parent pom 2017-01-09 12:59:26 +05:30
Rasika Perera
fc28a2b7d0 Merge pull request #244 from ayyoob/3.0.0
IOTS-372 & IOTS-370 & Made plugins and sample pom to use the filter properties
2017-01-09 07:21:17 +05:30
ayyoob
502999307a merged with origin 2017-01-08 23:28:58 +05:30
ayyoob
751eef086e revived connected cup sample 2017-01-08 22:53:23 +05:30
ayyoob
9c12a2c4a0 changed default h2 port to 9095 2017-01-08 21:29:28 +05:30
ayyoob
afde45b2f0 Added default values for input and output adapters 2017-01-08 21:29:08 +05:30
Rasika Perera
68568c9ed7 Updated cdmf into [2.0.7-SNAPSHOT] cdmf-plugins into [3.0.6-SNAPSHOT] 2017-01-08 08:18:31 +05:30
Rasika Perera
b7eac182c2 Merge pull request #243 from wso2/release-3.0.0-BETA2
Release 3.0.0-BETA2
2017-01-07 22:37:29 +05:30
WSO2 Builder
0b7861f5c1 [maven-release-plugin] prepare for next development iteration 2017-01-07 16:55:39 +00:00
WSO2 Builder
224130ce6d [maven-release-plugin] prepare release v3.0.0-BETA2 2017-01-07 16:43:27 +00:00
Rasika Perera
18d97073d1 Updated cdmf-plugins version into [3.0.5] 2017-01-07 22:06:26 +05:30
Rasika Perera
a6e5ab4531 Renamed pom.xml var [carbon.kernel.version.iotcore] into [carbon.kernel.version] 2017-01-07 08:23:29 +05:30
Rasika Perera
e04be13e52 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-06 20:30:53 +05:30
Rasika Perera
414044177d Merge pull request #242 from menakaj/master
Fixed https://wso2.org/jira/browse/IOTS-360 : Modifying current UI integration tests.
2017-01-06 19:37:15 +05:30
Rasika Perera
452950c7e5 Merge pull request #240 from geethkokila/master
Adding the ios gateway support for the iot server
2017-01-06 19:35:04 +05:30
Menaka Jayawardena
c9ab7103d8 Fixed IOTS-360 : Modifying current ui integration tests. 2017-01-06 19:31:40 +05:30
Rasika Perera
cb4b5d9732 Merge pull request #241 from menakaj/master
Fixed https://wso2.org/jira/browse/IOTS-359
2017-01-06 19:27:37 +05:30
Rasika Perera
ba46ff6dd0 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-06 19:03:32 +05:30
Rasika Perera
a4a5a42206 Merge pull request #239 from milanperera/latest-master
Improved scope-permission mapping
2017-01-06 19:02:26 +05:30
geethkokila
838d1cf610 Adding the ios gateway support for the iot server 2017-01-06 17:14:00 +05:30
Milan Perera
df79fcd6fd Merge branch 'master' of https://github.com/wso2/product-iots into latest-master 2017-01-06 16:51:39 +05:30
Milan Perera
10866d2e6c Updated APIM version 2017-01-06 16:50:18 +05:30
Rasika Perera
2e220d21ec Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-06 14:20:57 +05:30
Menaka Jayawardena
f40159eca3 Merge remote-tracking branch 'origin/master' 2017-01-06 14:19:16 +05:30
Menaka Jayawardena
88e696b4e9 Adding custom Test Automation Extensions to start up the servers. 2017-01-06 14:18:58 +05:30
Menaka Jayawardena
284c221056 Changed the integration pom version to 3.0.1-SNAPSHOT. 2017-01-06 14:16:36 +05:30
Rasika Perera
df281af01a Merge pull request #238 from ruwany/master
Adding auto_server_port
2017-01-06 14:16:24 +05:30
Ace
7cfa3970ed Adding auto_server_port 2017-01-06 13:34:36 +05:30
Milan Perera
11b0db7bed Fixed version conflics 2017-01-06 13:17:25 +05:30
ayyoob
754fbe7dd3 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-05 22:27:32 +05:30
ayyoob
8888383e81 added deployer features 2017-01-05 22:27:27 +05:30
Rasika Perera
c5d00adc43 Merge pull request #236 from GPrathap/master
fixed: IOTS-204, IOTS-344
2017-01-05 14:42:16 +05:30