Commit Graph

1510 Commits

Author SHA1 Message Date
susinda
5de566ca0c device operation permisions changed, removed 'any-device', added 'disenrole' and 'owning-device' 2017-02-13 14:42:57 +05:30
Menaka Jayawardena
e70306ac17 Fixed Android Operations Integration Tests. 2017-02-13 14:42:27 +05:30
susinda
84adbc45ae binaries and images removed, added all (script + jars) in the script_and_resources.zip file 2017-02-13 14:41:32 +05:30
susinda
cb1a3d462d ios policy addition moved to bottom, passwords changed 2017-02-13 14:41:07 +05:30
lakshani
9615c2fe5e merging lakshani's changes 2017-02-13 14:39:22 +05:30
lakshani
14645232b8 merging lakshani's changes on app-manager 2017-02-13 14:32:37 +05:30
GPrathap
f3f1fc40cb fixing a csrf property issue 2017-02-13 14:27:27 +05:30
Menaka Jayawardena
4d485c39c1 Merge PR #272 from menakaj 2017-02-13 14:26:23 +05:30
Menaka Jayawardena
134200375a merging menaka's commit 2017-02-13 14:22:27 +05:30
Menaka Jayawardena
2c17bafdf1 merging menaka's commit 'Fixed released cdmf and cdmf-plugins versions.' 2017-02-13 14:12:23 +05:30
susinda
16c8948dea adding modified jars 2017-02-13 14:00:27 +05:30
susinda
ba7a9c2f45 Some issues fixed for ios app upload and logs added, readme modified with new usernames 2017-02-13 13:59:19 +05:30
Menaka Jayawardena
816657a117 Removed Thread.sleep usages. 2017-02-13 13:57:41 +05:30
Menaka Jayawardena
962623f257 Fixed Mobile device management and Android Enrollment test flows. 2017-02-13 13:57:16 +05:30
susinda
cffb96bc93 Adding required files (apk, ipa, images and other) 2017-02-13 13:55:51 +05:30
susinda
c2891c76e0 emm renamed to IoTs, some permisiosn issues fixed, names changed to ryan and milan 2017-02-13 13:54:59 +05:30
susinda
0779e358ed merging susinda's commit 'mobile-qsg code added' 2017-02-13 13:53:21 +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