Commit Graph

1894 Commits

Author SHA1 Message Date
susinda
4049b59819 ios policy addition moved to bottom, passwords changed 2017-01-30 10:05:26 +05:30
lakshani
9fd6f5b99a Updated pom 2017-01-30 09:43:56 +05:30
lakshani
9f1637bc9f Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-30 00:23:15 +05:30
lakshani
6cd3950b05 Updated pom xmls accordding to rest connector 2017-01-30 00:07:01 +05:30
Rasika Perera
903045f5d2 Merge pull request #273 from GPrathap/master
fixing a csrf property issue
2017-01-29 19:32:49 +05:30
GPrathap
caec1677f6 fixing a csrf property issue 2017-01-29 17:09:35 +05:30
Ayyoob Hamza
83f4b392a8 Merge pull request #272 from menakaj/master
Integration Tests : Fixed Android Enrollment flow.
2017-01-27 17:31:41 +05:30
Menaka Jayawardena
237bd3dc2c Fixed released cdmf and cdmf-plugins versions. 2017-01-27 17:22:56 +05:30
susinda
6c9947b615 adding modified jars 2017-01-27 16:45:39 +05:30
susinda
82dff4f83f Some issues fixed for ios app upload and logs added, readme modified with new usernames 2017-01-27 16:16:27 +05:30
Menaka Jayawardena
cc5a474ea9 Removed Thread.sleep usages. 2017-01-26 22:44:44 +05:30
Menaka Jayawardena
e595b24920 Fixed Mobile device management and Android Enrollment test flows. 2017-01-26 15:48:41 +05:30
susinda
1c1ac5f052 Adding required files (apk, ipa, images and other) 2017-01-26 14:25:07 +05:30
susinda
f357b7dd62 emm renamed to IoTs, some permisiosn issues fixed, names changed to ryan and milan 2017-01-26 13:47:08 +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
susinda
3ab4416cb6 mobile-qsg code added 2017-01-25 14:57:56 +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