Commit Graph

1530 Commits

Author SHA1 Message Date
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
Rasika Perera
d4add58f9b Merge pull request #265 from chaturadilan/master
Bumping up appm version to 1.2.13
2017-01-23 12:29:08 +05:30
ayyoob
df304038da Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-20 21:22:50 +05:30
ayyoob
c91171e09c replaced jaggery.conf 2017-01-20 21:21:15 +05:30
Rasika Perera
bfd3bc2ab0 Updated cdmf into [2.0.9] cdmf-plugins into [3.0.8] 2017-01-20 20:16:28 +05:30
Rasika Perera
56c6f6dee9 Updating LICENSE.txt 2017-01-20 19:44:28 +05:30
Chatura Dilan
bd6de31582 Bumping up appm version to 1.2.13 2017-01-20 18:24:14 +05:30
Rasika Perera
fc4eb83297 update INSTALL.txt and README.txt 2017-01-20 18:09:16 +05:30
ayyoob
61e28471de fixed connected cup sample issues 2017-01-20 16:27:32 +05:30
Rasika Perera
1015ca40dc Updating LICENSE.txt 2017-01-20 10:28:05 +05:30
Rasika Perera
9dbab2cf2b Updating LICENSE.txt 2017-01-20 10:13:09 +05:30
Rasika Perera
40880a434b Created LICENSE.txt for iot-analytics 2017-01-20 09:58:29 +05:30
Rasika Perera
6661a8671b Updated LICENSE.txt for message-broker 2017-01-20 09:58:13 +05:30
Rasika Perera
5a2a6e73ec Updated LICENSE.txt for iot-core 2017-01-20 09:57:53 +05:30
Rasika Perera
2db9f661ac Updated MB user-agent params and server name 2017-01-20 09:08:09 +05:30
Rasika Perera
00cb7108db Version bump on cdmf into [2.0.8] and cdmf-plugins into [3.0.7] 2017-01-20 08:45:26 +05:30
Rasika Perera
bf61a210f8 Release note updated for 3.0.0 2017-01-20 08:41:05 +05:30