Commit Graph

2675 Commits

Author SHA1 Message Date
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
GPrathap
d8fdd18dde Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-05 14:39:46 +05:30
GPrathap
acb4593b9a fixed: https://wso2.org/jira/browse/IOTS-344 2017-01-05 14:19:46 +05:30
Rasika Perera
c51d630bfd Merge pull request #234 from ruwany/jira-fix
Making h2 db shareable between das and iot core
2017-01-05 12:42:21 +05:30
GPrathap
2e13e834c5 fixed: IOTS-204 2017-01-05 12:36:31 +05:30
Milan Perera
4576a700e8 Updated to APIM latest snapshot version 2017-01-05 11:23:07 +05:30
Milan Perera
1f172a65ee Merge branch 'master' of https://github.com/ruwany/product-iots into latest-master 2017-01-05 10:05:33 +05:30
Milan Perera
45207898c0 Configured APIMs PasswordGrantHandler in identity.xml 2017-01-05 10:05:27 +05:30
Rasika Perera
56a976a84a Merge pull request #235 from rasika/master
Fixing https://wso2.org/jira/browse/IOTS-356
2017-01-04 19:53:06 +05:30
Rasika Perera
d93d9dd0a6 Fixing https://wso2.org/jira/browse/IOTS-356 2017-01-04 19:20:16 +05:30
Ace
70c656b5d4 reverting commit related to identity version bump 2017-01-04 18:18:29 +05:30
Ace
eaea7ff37f Merging with master 2017-01-04 18:03:08 +05:30
Ace
04128c7ee3 Making h2 db shareable between das and iot core 2017-01-04 17:51:37 +05:30
charitha
15d3a124b0 Increment plugin deployer version 2017-01-04 10:14:13 +05:30
charitha
85c4e31a74 Merge branch 'master' of https://github.com/wso2/product-iot-server 2017-01-04 10:13:18 +05:30
sinthuja
1c203e0f61 Merge remote-tracking branch 'origin/master' 2017-01-03 13:35:25 +05:30
sinthuja
970bb35260 Adding sso by default for analytics portal application. 2017-01-03 13:35:08 +05:30
Ruwan
172f41d8da Merge pull request #233 from rasika/master
Fixing IoTS version issue
2017-01-03 12:31:41 +05:30
Rasika Perera
6866ee8f24 Fixing IoTS version issue 2017-01-03 12:25:08 +05:30
charitha
f48e03dec1 Merge branch 'master' of https://github.com/wso2/product-iot-server 2017-01-03 08:33:50 +05:30
Ruwan
69fafb4150 Merge pull request #232 from GPrathap/master
updated designer.json
2017-01-03 08:27:54 +05:30
Ace
b22bfa88e6 Bumping IS versions to latest ones 2017-01-02 16:00:01 +05:30
GPrathap
24b6d4dc0e added org.wso2.carbon.apimgt.rest.api.dcr.feature 2017-01-02 14:41:59 +05:30
GPrathap
f4bbb1517a upgraded carbon dashboard server version 2017-01-02 14:36:12 +05:30
GPrathap
9192f8e65c updated designer.json 2017-01-02 14:34:38 +05:30
Menaka Jayawardena
329407d318 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-02 12:24:20 +05:30