Commit Graph

1445 Commits

Author SHA1 Message Date
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
charitha
7a21ca4a44 Merge branch 'master' of https://github.com/wso2/product-iot-server 2017-01-02 11:53:12 +05:30
Dimuth
37789891e7 location-data-visualizer sample added to product-iots/modules/samples 2017-01-01 21:48:49 +05:30
Rasika Perera
598a41e964 Merge pull request #230 from rasika/master
Upgrading CDMF and CDMF-plugins
2016-12-25 07:55:20 +05:30
Rasika Perera
36480c3c80 Upgrading CDMF and CDMF-plugins 2016-12-25 07:54:31 +05:30
Rasika Perera
8e7931baa8 Merge pull request #229 from wso2/release-1.0.0-beta
Release 3.0.0 BETA
2016-12-25 02:22:03 +05:30
WSO2 Builder
4cd01294ff [maven-release-plugin] prepare for next development iteration 2016-12-24 20:40:57 +00:00
WSO2 Builder
990d941c75 [maven-release-plugin] prepare release v3.0.0-BETA 2016-12-24 20:34:55 +00:00
Rasika Perera
c3cf4516cc Merge pull request #228 from rasika/master
Upgrading CDMF and CDMF-plugins
2016-12-25 01:59:21 +05:30
Rasika Perera
879a3b1c5b Upgrading CDMF and CDMF-plugins 2016-12-25 01:58:25 +05:30
Menaka Jayawardena
53843181f7 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-23 12:27:38 +05:30
charitha
f571c26e57 Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-23 10:06:07 +05:30
Charitha Goonetilleke
daababf256 Merge pull request #227 from ruwany/master
Migrating appm/apim/identity/registry/governance to latest versions
2016-12-23 10:04:05 +05:30
Ace
f0236559b8 updating appm dependencies to relased version 2016-12-22 23:04:35 +05:30
charitha
e75c79cd66 Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-22 18:40:37 +05:30
Ace
36ec90b681 Bumping oauth dependencies 2016-12-22 15:42:17 +05:30
Geeth
1245c49d36 Merge pull request #225 from Supun94/master
Support for Device Management Policy Merging
2016-12-22 11:13:00 +05:30
Ace
6fa320f8bb Updating identity/auth-saml dependencies to latest 2016-12-22 11:02:36 +05:30
Supun94
4cac630ca7 Merge branch 'master' of https://github.com/Supun94/product-iots 2016-12-22 11:01:34 +05:30
Supun94
91cf3015a4 Minor refactoring on cdm-config file 2016-12-22 10:51:56 +05:30
Supun94
4e845dcc37 Changing cdm-config file 2016-12-22 10:51:56 +05:30
charitha
f6e9104805 Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-22 09:10:46 +05:30
Rasika Perera
a3b3d92be0 Disable hostname verification for opensaml http-client 2016-12-22 08:31:14 +05:30
charitha
fa8c88c783 Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-20 22:00:30 +05:30
Rasika Perera
2b35ff2aa8 Merge pull request #226 from charithag/master-remove-carbon-console
Remove carbon console ui from MB
2016-12-20 13:05:00 +05:30
charitha
c3d2774e09 Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-20 12:43:24 +05:30
charitha
ea333d897e Remove carbon console UI from MB 2016-12-20 12:31:13 +05:30
Rasika Perera
60b0ddb3ab Version bump of [carbon-analytics-common] 2016-12-20 09:38:08 +05:30
charitha
05ab111437 Merge branch 'master' of https://github.com/madawas/product-iots 2016-12-19 15:39:53 +05:30
Supun94
7147155e05 Changing cdm-config file 2016-12-19 15:39:13 +05:30
Ace
d48f4e03ea Adding iot-core specific is bundles to accomodate appm identity version upgrade 2016-12-19 15:26:43 +05:30