Commit Graph

1183 Commits

Author SHA1 Message Date
Susinda
a019cf66c7 Reverting mobile-qsg refactoring commit 2017-03-02 16:32:53 +05:30
Susinda
e20eb4aa4f mobile-qsg is packed with iot-core 2017-03-01 14:49:27 +05:30
lakshani
22846c7bc7 added test cases for chage device status 2017-02-07 23:54:24 +05:30
Milan Perera
471d1fe1c5 Revert "Merge pull request #283 from milanperera/cloud"
This reverts commit 6e5e149c87, reversing
changes made to dc0d0c0c53.
2017-02-02 10:38:30 +05:30
Milan Perera
d74ad8a76a Resolved conflicts and merged 2017-02-01 12:56:21 +05:30
ayyoob
c61cd953b2 few fixes after testing sso 2017-02-01 00:08:51 +05:30
WSO2 Builder
a283be7ed3 [maven-release-plugin] prepare for next development iteration 2017-01-31 14:54:18 +00:00
WSO2 Builder
9fba0db73f [maven-release-plugin] prepare release v3.1.0-M1 2017-01-31 14:52:29 +00:00
Rasika Perera
4d94d42305 Update pom.xml 2017-01-31 20:15:11 +05:30
ayyoob
3610ed762d enabled UseAuthenticatedUserDomainCrypto 2017-01-31 14:19:02 +05:30
Menaka Jayawardena
756ecb1769 Enabled backend integration tests in the build 2017-01-31 01:29:54 +05:30
Menaka Jayawardena
1fec4b3289 Removed unwanted dependency 2017-01-30 23:56:20 +05:30
ayyoob
ab70dbe38a few changes after testing multi tenancy 2017-01-30 22:33:18 +05:30
lakshani
d555f95781 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-30 19:41:30 +05:30
Ayyoob Hamza
d83f7112d9 Merge pull request #278 from menakaj/master
Fixed Android Operations Integration Tests.
2017-01-30 17:26:11 +05:30
Susinda Perera
47e337532e Merge pull request #277 from susinda/mobile-qsg
device operation permissions changed, removed 'any-device', added 'disenrole'
2017-01-30 16:19:04 +05:30
susinda
35963a07e4 device operation permisions changed, removed 'any-device', added 'disenrole' and 'owning-device' 2017-01-30 16:14:28 +05:30
Menaka Jayawardena
5dbfa7d187 Fixed Android Operations Integration Tests. 2017-01-30 16:00:02 +05:30
Susinda Perera
594533cfe0 Merge pull request #275 from susinda/mobile-qsg
Mobile qsg - Adding QSG scripts
2017-01-30 10:17:08 +05:30
susinda
84b163c85c binaries and images removed, added all (script + jars) in the script_and_resources.zip file 2017-01-30 10:10:49 +05:30
susinda
4049b59819 ios policy addition moved to bottom, passwords changed 2017-01-30 10:05:26 +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
GPrathap
caec1677f6 fixing a csrf property issue 2017-01-29 17:09:35 +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
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
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
ayyoob
d6695a9082 renamed profile names 2017-01-25 09:24:38 +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
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
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