Commit Graph

1496 Commits

Author SHA1 Message Date
Hasunie
65289741a1 upgrading carbon.api.mgt.version 2017-02-28 15:33:26 +05:30
Milan Perera
920857515c Merge pull request #291 from ayyoob/210releasepatch
removed mutualssl feature and the updated apim version
2017-02-14 15:54:31 +05:30
ayyoob
cb9d17882c removed mutualssl feature and the updated apim version 2017-02-09 03:04:25 +05:30
ayyoob
59b86f9d50 Merge branch 'cloud-3.1.0' of https://github.com/wso2/product-iots into cloud-3.1.0 2017-02-08 13:14:23 +05:30
ayyoob
7daedd6516 added jwt authenticator 2017-02-08 13:11:03 +05:30
Geeth
608b65a06f Merge pull request #287 from Kamidu/cloud-3.1.0
add the cloud menu to the iot pack
2017-02-07 20:50:10 +05:30
kamidu
0eb45e7c92 add the cloud menu to the iot pack 2017-02-07 20:24:23 +05:30
ayyoob
ef99c0f306 added default credential as properties 2017-02-06 03:48:20 +05:30
ayyoob
1e25f08945 fixed tokenValidationUrlIssue 2017-02-06 00:52:36 +05:30
ayyoob
f890415bae enabled mutual ssl support and added artifact deployment related features 2017-02-05 17:53:37 +05:30
ayyoob
ecda000395 used jwt grant type instead of saml 2017-02-04 20:52:24 +05:30
Ayyoob Hamza
2da70ad50a Merge pull request #284 from ayyoob/cloud-3.1.0
changes adapter configs after testing
2017-02-02 04:46:12 +05:30
ayyoob
fe81bb75ca updated apimgt version 2017-02-02 04:28:49 +05:30
ayyoob
b03b958979 changes adapter configs after testing 2017-02-02 03:17:40 +05:30
ayyoob
c61cd953b2 few fixes after testing sso 2017-02-01 00:08:51 +05:30
ayyoob
3610ed762d enabled UseAuthenticatedUserDomainCrypto 2017-01-31 14:19:02 +05:30
ayyoob
ab70dbe38a few changes after testing multi tenancy 2017-01-30 22:33:18 +05:30
Ayyoob Hamza
26197ef770 Merge pull request #271 from ayyoob/3.0.0
removed apim dependencies and solved sso tenant login issues.
2017-01-26 12:18:33 +05:30
Chatura Dilan
f04ece804e Merge pull request #269 from menakaj/master
Integration tests modifications
2017-01-26 10:23:22 +05:30
ayyoob
ca53efdab0 fixed sso login issue in portal in multi tenant 2017-01-26 00:30:03 +05:30
Menaka Jayawardena
a6519d1e04 Restored data sources change. 2017-01-25 17:14:03 +05:30
Menaka Jayawardena
3f010951af POM versions updated for next release. 2017-01-25 17:10:47 +05:30
Menaka Jayawardena
e8508b1dd0 Modifying Integration tests. 2017-01-25 16:26:40 +05:30
Menaka Jayawardena
5d41fe313b Merge branch 'backend-integration'
# Conflicts:
#	modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java
#	modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
#	modules/integration/tests-integration/src/test/resources/automation.xml
#	modules/integration/tests-integration/src/test/resources/testng.xml
2017-01-25 15:50:43 +05:30
ayyoob
e45682806f Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-25 14:25:38 +05:30
ayyoob
2ca23cce29 changed configs to support custom grant type 2017-01-25 14:25:28 +05:30
Menaka Jayawardena
cacc4d4772 Access token generation flow fixed. 2017-01-25 14:18:36 +05:30
Rasika Perera
3ec48f3386 Update README.md 2017-01-25 10:37:26 +05:30
ayyoob
d6695a9082 renamed profile names 2017-01-25 09:24:38 +05:30
Rasika Perera
7cab1ef960 Update README.md 2017-01-25 00:26:25 +05:30
ayyoob
7290f64711 Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0 2017-01-24 22:23:44 +05:30
Rasika Perera
5e43195e55 Version bump on cdmf into [2.0.11-SNAPSHOT] cdmf-plugins into [3.0.9-SNAPSHOT] 2017-01-24 21:16:08 +05:30
Rasika Perera
93dd7e6d59 Merge pull request #268 from wso2/release-3.0.0-RC2
Release 3.0.0
2017-01-24 21:13:50 +05:30
ayyoob
232e63aeea merged with origin 2017-01-24 20:47:24 +05:30
ayyoob
1ac1355eee removed cdmc dependency from core 2017-01-24 19:33:36 +05:30
Ayyoob Hamza
f0a952dbe2 Merge pull request #267 from wso2/revert-266-backend-integration
Revert "Re-Enabling backend integration tests."
2017-01-24 11:49:10 +05:30
Ayyoob Hamza
030938e83e Revert "Re-Enabling backend integration tests." 2017-01-24 11:48:53 +05:30
Menaka Jayawardena
3bc01b0bfb Pom versions updated. 2017-01-24 11:31:16 +05:30
Hasunie
c6fda7e3d1 Merge pull request #266 from menakaj/backend-integration
Re-Enabling backend integration tests.
2017-01-24 11:26:08 +05:30
WSO2 Builder
369fb23a25 [maven-release-plugin] prepare for next development iteration 2017-01-24 05:51:48 +00:00
Menaka Jayawardena
0f18eb9d5e Re-Enabling backend integration tests. 2017-01-24 11:21:05 +05:30
WSO2 Builder
f28b4f389b [maven-release-plugin] prepare release v3.0.0-RC2 2017-01-24 05:44:17 +00:00
Rasika Perera
9c2fc5985e [-Diot.gatway.host="localhost"] -> [-Diot.gateway.host="localhost" 2017-01-24 11:06:06 +05:30
Rasika Perera
0b61f822c6 Version bumping dashboard into [2.0.6] 2017-01-23 23:20:42 +05:30
Rasika Perera
e1e330e83e Fixed profiling issue on jss service 2017-01-23 16:21:14 +05:30
Rasika Perera
50bd257247 Updated cdmf and cdmf-plugins versions 2017-01-23 15:19:38 +05:30
Rasika Perera
375f555a2c Updated LICENSE.txt 2017-01-23 15:17:06 +05:30
Rasika Perera
8ba75c6755 Updated cdmf into [2.0.10-SNAPSHOT] and cdmf-plugins [3.0.9-SNAPSHOT] 2017-01-23 15:02:12 +05:30
Rasika Perera
0ccd63936b Updated OWSAP property file 2017-01-23 12:43:37 +05:30
Rasika Perera
d5c5f66c1f Updated appm into [1.2.14] 2017-01-23 12:41:56 +05:30